aa

jiangping

2023-10-16 2fc80842a96ced69006186f4febe9a8b658b2317

aa

 .idea/dmMes.iml

@@ -5,5 +5,14 @@
    <content url="file://$MODULE_DIR$" />
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
    <orderEntry type="module-library" exported="">
      <library>
        <CLASSES>
          <root url="jar://$MODULE_DIR$/server/lib/antelope-other-client-20230203.0.1.jar!/" />
        </CLASSES>
        <JAVADOC />
        <SOURCES />
      </library>
    </orderEntry>
  </component>
</module>

 server/src/main/java/doumeemes/service/ext/impl/MaterialExtServiceImpl.java

@@ -275,8 +275,11 @@
     for(int i=0;i<materialList.size();i++){
         Integer counter=i+2;
         Material material=materialList.get(i);
         if(StringUtils.isEmpty(material.getName())||StringUtils.isEmpty(material.getCode())||StringUtils.isEmpty(material.getUnitname())
         ||StringUtils.isEmpty(material.getFormationname())||StringUtils.isEmpty(material.getAttr())
         if(StringUtils.isEmpty(material.getName())
                 ||StringUtils.isEmpty(material.getCode())
                 ||StringUtils.isEmpty(material.getUnitname())
                 ||StringUtils.isEmpty(material.getFormationname())
                 ||StringUtils.isEmpty(material.getAttr())
                 ||StringUtils.isEmpty(material.getCateUnionName())){

             throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "第"+counter+"行：导入数据内容不能为空！");

 server/src/main/java/doumeemes/service/ext/impl/WorkorderRecordExtServiceImpl.java

@@ -137,6 +137,9 @@
            for(WorkorderRecordExtListVO model : result){
                //查询生产人员姓名
                initProUser(user,model,allDepartList);
//                BigDecimal s =new BigDecimal(Constants.formatIntegerNum(model.getSalary()));
//                s.divide(new BigDecimal(0),2);
//                model.setSalary(s.doubleValue());
            }
        }
        return PageData.from(new PageInfo<>(result));

 server/src/main/resources/application.yml

@@ -9,11 +9,7 @@
#  application:
#  name: doumeemes
  profiles:
<<<<<<< HEAD
    active: standardTest
=======
    active: standardLingyang
>>>>>>> e545f382c2989b1a6a510d0fed66b5e835bc163c
  # JSON返回配置
  jackson:
    # 默认时区