同步管理系统代码

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java

@@ -283,7 +283,10 @@ public class UdiRelevanceController {
                 return ResultVOUtils.error(500, vailResult);
         }
 
-
+        //判断父id不为空就吧值给到id里面防止id变成详情id
+        if(udiRelevanceResponse.getPid()!=null){
+            udiRelevanceResponse.setId(udiRelevanceResponse.getPid());
+        }
         UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
         BeanUtils.copyProperties(udiRelevanceResponse, udiRelevanceEntity);
         udiRelevanceEntity.setId(udiRelevanceResponse.getId() + "");
@@ -317,6 +320,7 @@ public class UdiRelevanceController {
         udiInfoEntity.setAllowNoBatch(udiRelevanceResponse.isAllowNoBatch());
         udiInfoEntity.setAllowNoExpire(udiRelevanceResponse.isAllowNoExpire());
         udiInfoEntity.setAllowNoProduct(udiRelevanceResponse.isAllowNoProduct());
+        udiInfoEntity.setZxxsbzbhsydysl(udiRelevanceResponse.getZxxsbzbhsydysl());
         udiInfoEntity.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1());
         udiInfoEntity.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2());
         udiInfoEntity.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3());

api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupCompanyController.java

@@ -59,6 +59,8 @@ public class SupCompanyController {
     private SupCertService supCertService;
     @Resource
     BasicUnitMaintainService basicUnitMaintainService;
+    @Resource
+    SupCompanyService supCompanyService;
 
 
     @AuthRuleAnnotation("")
@@ -77,6 +79,47 @@ public class SupCompanyController {
     @PostMapping("/api/pur/addCompany")
     public BaseResponse insertCompany(@RequestBody SupCompanyEntity companyEntity) {
 
+        //判断是不是存在草稿
+        if(companyEntity.getAuditStatus()==6){
+            List<SupCertEntity> supCertEntityList = supCertService.findAll(companyEntity.getCustomerId()); for(SupCertEntity obj:supCertEntityList){
+                if(obj.getAuditStatus()==0){
+                    return  ResultVOUtils.error(999,"证书中存在草稿不允许提交！");
+                }
+            }
+
+            //提交审核
+            FilterCertSetsRequest filterCertSetsRequest = new FilterCertSetsRequest();
+            filterCertSetsRequest.setType(ConstantStatus.CERT_COMPANY);
+            filterCertSetsRequest.setNeed(1);
+            List<SupCertSetEntity> supCertSetEntities = supCertSetService.filterCertSets(filterCertSetsRequest);
+
+            //验证
+            ListIterator<SupCertSetEntity> iterable = supCertSetEntities.listIterator();
+            while (iterable.hasNext()) {
+                SupCertSetEntity supCertSetEntity = iterable.next();
+                if (supCertSetEntity.isNeed()) {
+                    for (SupCertEntity supCertEntity : supCertEntityList) {
+                        if (supCertEntity.getName().equals(supCertSetEntity.getName())) {
+                            if (StrUtil.isNotEmpty(supCertEntity.getFilePath())) {
+                                iterable.remove();
+                                break;
+                            }
+                        }
+                    }
+                }
+
+            }
+            String errMsg = "";
+            if (supCertSetEntities.size() > 0) {
+                for (SupCertSetEntity supCertSetEntity : supCertSetEntities) {
+                    errMsg = errMsg + "," + supCertSetEntity.getName();
+                }
+                return ResultVOUtils.error(500, errMsg.substring(1) + "等证书未上传，无法提交审核！");
+            }
+
+
+        }
+
         String customerId = CustomUtil.getId();     //重新生成customerId
         CustomerContactEntity customerContactEntity = new CustomerContactEntity();
         customerContactEntity.setTel(companyEntity.getTel());
@@ -234,7 +277,7 @@ public class SupCompanyController {
     @AuthRuleAnnotation("")
     @PostMapping("api/pur/supCompany/delete")
     public BaseResponse deleteSupCompany(@RequestBody DeleteRequest deleteRequest) {
-        boolean b = customerContactService.deleteById(Long.parseLong(deleteRequest.getId()));
+        boolean b = supCompanyService.deleteCompany(Long.parseLong(deleteRequest.getId()));
         if (b)
             return ResultVOUtils.success("删除成功");
         else {

api-admin/src/main/java/com/glxp/sale/admin/entity/inout/StockOrderEntity.java

@@ -51,7 +51,7 @@ public class StockOrderEntity {
     private String dept;
     private String deptName;
     private String remark;
-
+    private Boolean noInvOut;
     private String reviewUserName;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderPostRequest.java

@@ -31,5 +31,6 @@ public class StockOrderPostRequest {
     private String fromSubInvCode;
     private Integer thirdPartyDate;
     private List<StockOrderDetailEntity> subErpOrders;
+    private Boolean noInvOut;
     private String customerId;
 }

api-admin/src/main/java/com/glxp/sale/admin/res/basic/UdiRelevanceResponse.java

@@ -87,6 +87,7 @@ public class UdiRelevanceResponse {
     private String basicPrductRemak8;
     private Boolean useMuti;      //是否多次使用
     private Integer useNum;     //最小包装单元可使用次数
+    private Integer pid; //用来存父id
 
     //产品代理商
     private String cpdls;

api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml

@@ -30,7 +30,7 @@
                                 thirdSysFk, status, statusInfo, `type`, sourceType,
                                 printStatus, unitIdFk, customerId, thirdOrderFk, orderIdFk,
                                 totalPrice, locStorageCode, supplementNo, createUser, reviewUser, entrustEnd, auditTime,
-                                updateTime, invWarehouseCode, fromSubInvCode, dept)
+                                updateTime, invWarehouseCode, fromSubInvCode, dept ,noInvOut)
         values (#{id},
                 #{billNo},
                 #{billdate},
@@ -45,7 +45,7 @@
                 #{sourceType},
                 #{printStatus}, #{unitIdFk}, #{customerId}, #{thirdOrderFk}, #{orderIdFk}, #{totalPrice},
                 #{locStorageCode}, #{supplementNo}, #{createUser}, #{reviewUser}, #{entrustEnd}, #{auditTime},
-                #{updateTime}, #{invWarehouseCode}, #{fromSubInvCode}, #{dept})
+                #{updateTime}, #{invWarehouseCode}, #{fromSubInvCode}, #{dept},#{noInvOut})
     </insert>
     <update id="updateById" parameterType="com.glxp.sale.admin.entity.inout.StockOrderEntity">
         UPDATE stock_order
@@ -77,6 +77,7 @@
             <if test="invWarehouseCode != null">invWarehouseCode=#{invWarehouseCode},</if>
             <if test="fromSubInvCode != null">fromSubInvCode=#{fromSubInvCode},</if>
             <if test="dept != null">dept=#{dept},</if>
+            <if test="noInvOut != null">noInvOut=#{noInvOut},</if>
 
         </trim>
         WHERE id = #{id}

api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml

@@ -40,6 +40,7 @@
             <if test="supId != '' and supId != null">
                 AND supId = #{supId}
             </if>
+            GROUP BY productId
         </where>
 
     </select>

api-admin/src/main/resources/schemas/schema_v2.1.sql

@@ -3,6 +3,7 @@
 CALL Pro_Temp_ColumnWork ('basic_export_status','receiveStatus','varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork ('stock_order','noInvOut','tinyint ', 1);
 
 
 INSERT ignore INTO   scheduled(id, cronName, cron, customerId, remark)