Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

winsea-haixin-platform-backend/src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 9100
+  port: 8090
 
 spring:
   application:
@@ -7,7 +7,7 @@ spring:
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
     password: Ccj841968545
-    url: jdbc:mysql://47.100.3.209:3306/ylyy?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://47.100.3.209:3306/yiliangyiyun_test?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
     username: root
   redis:
     database: 0

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/AppVersionController.java

@@ -1,9 +1,13 @@
 package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.yh.saas.plugin.yiliangyiyun.entity.AppVersion;
+import com.yh.saas.plugin.yiliangyiyun.entity.CommonUser;
 import com.yh.saas.plugin.yiliangyiyun.service.IAppVersionService;
+import com.yh.saas.plugin.yiliangyiyun.service.ICommonUserService;
 import com.yh.saas.plugin.yiliangyiyun.util.GeTuiUtils;
+import org.apache.commons.codec.digest.Md5Crypt;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -11,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * <p>
  * APP版本管理 前端控制器
@@ -25,6 +31,8 @@ public class AppVersionController {
     @Autowired
     private IAppVersionService appVersionService;
     @Autowired
+    private ICommonUserService commonUserService;
+    @Autowired
     private GeTuiUtils geTuiUtils;
     /**
      * 查看版本信息
@@ -38,7 +46,12 @@ public class AppVersionController {
      */
     @GetMapping("/test")
     public void test(@RequestParam String userId) {
-        geTuiUtils.pushByCid("推送测试","推送测试内容",userId);
+//        geTuiUtils.pushByCid("推送测试","推送测试内容",userId);
+       List<CommonUser> list =   commonUserService.selectList(new EntityWrapper<>());
+       for(CommonUser commonUser:list){
+           commonUser.setPassword(Md5Crypt.md5Crypt("123456".getBytes(), "$1$" + commonUser.getPhone().substring(0, 7)));
+       }
+       commonUserService.updateBatchById(list);
     }
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -168,7 +168,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
             user.setId(commonStaff.getStaffId());
             CommonCompany commonCompany = commonCompanyService.selectById(commonStaff.getCompId());
             if(commonCompany != null){
-                user.setUserName(commonCompany.getCompName() + "-" +commonStaff.getStaffName());
+                user.setUserName(commonCompany.getCompSimpleName() + "-" +commonStaff.getStaffName());
             }
         }
         else{
@@ -324,7 +324,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
                 userDO.setId(commonStaff.getStaffId());
                 CommonCompany commonCompany = commonCompanyService.selectById(commonStaff.getCompId());
                 if(commonCompany != null){
-                    userDO.setUserName(commonCompany.getCompName() + "-" +commonStaff.getStaffName());
+                    userDO.setUserName(commonCompany.getCompSimpleName() + "-" +commonStaff.getStaffName());
                 }
             }
             else{

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/InOutWarehouseTaskServiceImpl.java

@@ -211,7 +211,8 @@ public class InOutWarehouseTaskServiceImpl extends ServiceImpl<InOutWarehouseTas
     @Override
     public List<InOutWarehouseTask> getInOutWarehouseTask(String relevanceId) {
         List<InOutWarehouseTask> inOutWarehouseTaskList = inOutWarehouseTaskService.selectList(new EntityWrapper<InOutWarehouseTask>()
-                .eq(InOutWarehouseTask.QueryFiles.relevanceId, relevanceId).eq(InOutWarehouseTask.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0));
+                .eq(InOutWarehouseTask.QueryFiles.relevanceId, relevanceId).eq(InOutWarehouseTask.QueryFiles.DELETE_FLAG, NumberConstant.CONSTANT0)
+        .orderBy("in_out_flag"));
         if (CollectionUtils.isNotEmpty(inOutWarehouseTaskList)) {
             for (InOutWarehouseTask inOutWarehouseTask1 : inOutWarehouseTaskList) {
                 String taskId = "";

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PaymentManagementServiceImpl.java

@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.base.entity.CommonCompany;
 import com.winsea.svc.base.base.entity.CommonRoleResource;
+import com.winsea.svc.base.base.entity.CommonStaff;
 import com.winsea.svc.base.base.service.ICommonCompanyService;
 import com.winsea.svc.base.base.service.ICommonRoleResourceService;
+import com.winsea.svc.base.base.service.ICommonStaffService;
 import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
@@ -64,6 +66,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
     @Autowired
     private IWarehousePositionInfoService warehousePositionInfoService;
     @Autowired
+    private ICommonStaffService staffService;
+    @Autowired
     private IWarehousePositionStorageInfoService warehousePositionStorageInfoService;
     @Autowired
     private IWeightedDetailsService weightedDetailsService;
@@ -118,11 +122,13 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
                 if (weighingManagement!=null){
                     paymentManagement1.setContractPrice(weighingManagement.getContractPrice());
                     paymentManagement1.setWeighingPictureAddress(weighingManagement.getPictureAddress());
+                    paymentManagement1.setWeighingManagement(weighingManagement);
                 }
                 QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
                         .eq("relation_id", paymentManagement1.getRelationId()));
                 if (qualityInspectionManagement!=null){
                     paymentManagement1.setQualityInspectionPictureAddress(qualityInspectionManagement.getPictureAddress());
+                    paymentManagement1.setQualityInspectionManagement(qualityInspectionManagement);
                 }
                 String taskId = "";
                 // 只有待审核状态才有taskId
@@ -345,6 +351,8 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
     @Override
     public String payMoney(PaymentManagement paymentManagement) {
         List<PaymentManagement> paymentManagementList = paymentManagement.getPaymentManagementList();
+        CommonStaff commonStaff = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
+        paymentManagement.setCashier(commonStaff.getStaffName());
         Float money = paymentManagement.getMoney();
         //付款多条
         if (!CollectionUtils.isEmpty(paymentManagementList)) {

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PurchasePriceServiceImpl.java

@@ -162,7 +162,7 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
         }
         List<PurchasePriceDetail> details = this.purchasePriceDetailService.selectList(new EntityWrapper<PurchasePriceDetail>().eq("main_id",purchasePrice.getId()));
         purchasePrice.setDetails(details);
-        List<PurchasePriceDetailPrint> detailPrints = this.purchasePriceDetailPrintService.selectList(new EntityWrapper<PurchasePriceDetailPrint>().eq("main_id",purchasePrice.getId()));
+        List<PurchasePriceDetailPrint> detailPrints = this.purchasePriceDetailPrintService.selectList(new EntityWrapper<PurchasePriceDetailPrint>().eq("main_id",purchasePrice.getId()).orderBy("water_min"));
         purchasePrice.setDetailPrints(detailPrints);
         return purchasePrice;
     }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/QualityInspectionManagementServiceImpl.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.base.entity.CommonCompany;
+import com.winsea.svc.base.base.entity.CommonStaff;
 import com.winsea.svc.base.base.service.ICommonCompanyService;
+import com.winsea.svc.base.base.service.ICommonStaffService;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -40,6 +42,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
     private IWarehouseBaseInfoService warehouseBaseInfoService;
     @Autowired
     private IPaymentManagementService paymentManagementService;
+    @Autowired
+    private ICommonStaffService staffService;
     /**
      * 质检管理列表
      * @param qualityInspectionManagement
@@ -125,6 +129,9 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
      */
     @Override
     public String editQualityInspection(QualityInspectionManagement qualityInspectionManagement) {
+        qualityInspectionManagement.setQualityDate(new Date());
+        CommonStaff commonStaff = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
+        qualityInspectionManagement.setQualityInspector(commonStaff.getStaffName());
         boolean one=this.updateById(qualityInspectionManagement);
         //成功返回ok
         if (one ) {
@@ -163,6 +170,8 @@ public class QualityInspectionManagementServiceImpl extends ServiceImpl<QualityI
         qualityInspectionManagement.setRelationId(relationId);
         qualityInspectionManagement.setManagementType("1");
         qualityInspectionManagement.setQualityDate(new Date());
+        CommonStaff commonStaff = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
+        qualityInspectionManagement.setQualityInspector(commonStaff.getStaffName());
         //状态为已质检
         qualityInspectionManagement.setStatus(StatusEnum.INSPECTED.getName());
         qualityInspectionManagement.setStatusFlag(StatusEnum.INSPECTED.getFlag());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WeighingManagementServiceImpl.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.google.common.collect.Lists;
 import com.winsea.svc.base.base.entity.CommonCompany;
+import com.winsea.svc.base.base.entity.CommonStaff;
 import com.winsea.svc.base.base.service.ICommonCompanyService;
+import com.winsea.svc.base.base.service.ICommonStaffService;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
@@ -45,6 +47,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
     private IPurchasePriceService purchasePriceService;
     @Autowired
     private IContractManagementInfoService contractManagementInfoService;
+    @Autowired
+    private ICommonStaffService staffService;
     /**
      * 检斤管理列表
      * @param weighingManagement
@@ -116,6 +120,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         weighingManagement.setStatus(StatusEnum.WEIGHED_GROSS_WEIGHT.getName());
         weighingManagement.setStatusFlag(StatusEnum.WEIGHED_GROSS_WEIGHT.getFlag());
         weighingManagement.setGrossDate(new Date());
+        CommonStaff commonStaff = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
+        weighingManagement.setSecretaryWeigher(commonStaff.getStaffName());
         //质检信息
         QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
                 .eq("relation_id", weighingManagement.getRelationId()));
@@ -180,6 +186,8 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         weighingManagement.setStatus(StatusEnum.TARED.getName());
         weighingManagement.setStatusFlag(StatusEnum.TARED.getFlag());
         weighingManagement.setTareDate(new Date());
+        CommonStaff commonStaff = staffService.getInfo(AuthSecurityUtils.getCurrentUserId());
+        weighingManagement.setSkinInspector(commonStaff.getStaffName());
         //质检信息
         QualityInspectionManagement qualityInspectionManagement1 = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
                 .eq("relation_id", weighingManagement1.getRelationId()));

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PaymentManagementMapper.xml

@@ -100,7 +100,8 @@
         approve_status as approveStatus,
         status_flag as statusFlag,
         update_date as updateDate,
-        workflow_id as workflowId
+        workflow_id as workflowId,
+        unit_deduction as unitDeduction
         FROM payment_management
         WHERE delete_flag = '0'
         <if test="searchType != null and searchType != ''">
@@ -115,10 +116,10 @@
                 AND actual_collectionment-amount_ed_collectionable=0
             </if>
             <if test="searchType == 5">
-                AND amount_ing_payable-amount_ed_payable>0
+                AND status != '全部付款'
             </if>
             <if test="searchType == 6">
-                AND amount_ed_payable=amount_ing_payable
+                AND status == '全部付款'
             </if>
         </if>
         <if test="managementType != null and managementType != ''">

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/SettledCompanyInfoMapper.xml

@@ -120,10 +120,9 @@
         <if test="mainBusinessType != null and mainBusinessType != ''">
             AND (lower(main_business_type) like lower(CONCAT('%',#{mainBusinessType},'%')))
         </if>
-        ORDER BY status_flag asc , update_date DESC
         ) b
         ORDER BY
-        b.flag desc
+        b.flag,b.updateDate desc
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}
         </if>