Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun

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

@@ -12,6 +12,7 @@ import com.winsea.svc.base.base.service.ICommonRoleResourceService;
 import com.winsea.svc.base.security.entity.User;
 import com.winsea.svc.base.security.util.AuthSecurityUtils;
 import com.winsea.svc.base.workflow.entity.Workflow;
+import com.yh.saas.common.support.util.IdGenerator;
 import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
 import com.yh.saas.plugin.yiliangyiyun.entity.*;
 import com.yh.saas.plugin.yiliangyiyun.exception.YException;
@@ -54,7 +55,10 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
     private IIdentityAuthenticationInfoService iIdentityAuthenticationInfoService;
     @Autowired
     private IContractManagementInfoService ContractManagementInfoService;
-
+    @Autowired
+    private IWarehouseInOutInfoService warehouseInOutInfoService;
+    @Autowired
+    private IWarehouseInOutDetailService warehouseInOutDetailService;
 
     /**
      * 付款管理列表
@@ -165,6 +169,51 @@ public class PaymentManagementServiceImpl extends ServiceImpl<PaymentManagementM
         //未付
         paymentManagement.setAmountNotPayable(paymentManagement.getAmountIngPayable()-paymentManagement1.getAmountEdPayable());
         this.openAuditFlow(paymentManagement1);
+        //查询关联流转记录
+        QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
+                .eq("relation_id",paymentManagement1.getRelationId()));
+        WarehouseInOutInfo warehouseInOutInfo = warehouseInOutInfoService.selectOne(new EntityWrapper<WarehouseInOutInfo>()
+                .eq("warehouse_name",paymentManagement1.getWarehouseName())
+                .eq("bin_number",qualityInspectionManagement.getBinNumber()));
+        //不为空修改流转信息
+        if(warehouseInOutInfo != null){
+            warehouseInOutInfoService.updateById(warehouseInOutInfo);
+        }
+        else{
+            //生成流转信息
+            WarehouseInOutInfo warehouseInOutInfo1 = new WarehouseInOutInfo();
+            warehouseInOutInfo1.setId(IdGenerator.generateUUID());
+            warehouseInOutInfo1.setWarehouseName(paymentManagement1.getWarehouseName());
+            warehouseInOutInfo1.setBinNumber(qualityInspectionManagement.getBinNumber());
+            warehouseInOutInfo1.setGoodsName(paymentManagement1.getGoodsName());
+            warehouseInOutInfo1.setGrossWeight(paymentManagement1.getGrossWeight());
+            warehouseInOutInfo1.setTare(paymentManagement1.getTare());
+            warehouseInOutInfo1.setInOutType("收购入库");
+            warehouseInOutInfo1.setCarNo(paymentManagement1.getCarNo());
+            warehouseInOutInfo1.setContractNo(paymentManagement1.getPaymentNo());
+            warehouseInOutInfo1.setAgent(paymentManagement.getSettlementClerk());
+            warehouseInOutInfo1.setInOutDate(paymentManagement1.getCreateDate());
+            warehouseInOutInfo1.setGrade(qualityInspectionManagement.getGrade());
+            //潮粮取纯重，干粮取净重
+            if("潮粮".equals(paymentManagement1.getType())){
+                warehouseInOutInfo1.setNetWeight(paymentManagement1.getPureWeight());
+            }else{
+                warehouseInOutInfo1.setNetWeight(paymentManagement1.getNetWeight());
+            }
+            warehouseInOutInfo1.setStatusFlag("3");
+            warehouseInOutInfoService.insert(warehouseInOutInfo1);
+            WarehouseInOutDetail warehouseInOutDetail = new WarehouseInOutDetail();
+            warehouseInOutDetail.setId(IdGenerator.generateUUID());
+            warehouseInOutDetail.setInfoId(warehouseInOutInfo1.getId());
+            warehouseInOutDetail.setQualityInspector(qualityInspectionManagement.getQualityInspector());
+            warehouseInOutDetail.setWaterContent(qualityInspectionManagement.getWaterContent());
+            warehouseInOutDetail.setImpurity(qualityInspectionManagement.getImpurity());
+            warehouseInOutDetail.setBulkDensity(qualityInspectionManagement.getBulkDensity());
+            warehouseInOutDetail.setMildewGrain(qualityInspectionManagement.getMildewGrain());
+            warehouseInOutDetail.setJiaorenli(qualityInspectionManagement.getJiaorenli());
+            warehouseInOutDetail.setImperfectGrain(qualityInspectionManagement.getImperfectGrain());
+            warehouseInOutDetailService.insert(warehouseInOutDetail);
+        }
         this.updateById(paymentManagement);
         return "OK";
     }

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

@@ -229,8 +229,14 @@ public class PurchasePriceServiceImpl extends ServiceImpl<PurchasePriceMapper, P
     @Override
     public String purchasePriceAllowEdit(PurchasePrice purchasePrice) {
         WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectById(purchasePrice.getWarehouseId());
-        warehouseBaseInfo.setAllowEdit("1");
-        warehouseBaseInfoService.updateById(warehouseBaseInfo);
+        if("1".equals(warehouseBaseInfo.getAllowEdit())){
+            warehouseBaseInfo.setAllowEdit("0");
+            warehouseBaseInfoService.updateById(warehouseBaseInfo);
+        }
+        else{
+            warehouseBaseInfo.setAllowEdit("1");
+            warehouseBaseInfoService.updateById(warehouseBaseInfo);
+        }
         return "ok";
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/QRCodeUtil.java

@@ -23,9 +23,9 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
+import java.io.*;
+import java.net.URL;
+import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
@@ -79,11 +79,26 @@ public class QRCodeUtil implements InitializingBean {
 
             MatrixToImageWriter.writeToPath(bitMatrix, "PNG", path);
             //存放logo的文件夹
-            String path1 = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/logo.png";
+            // https://taohaoliang.oss-cn-beijing.aliyuncs.com/logo.png
+            String path1 = "https://taohaoliang.oss-cn-beijing.aliyuncs.com/";
+
+
+            URL url1 = new URL("https://taohaoliang.oss-cn-beijing.aliyuncs.com/logo.png");
+            URLConnection uc = url1.openConnection();
+            InputStream inputStream = uc.getInputStream();
+
+            FileOutputStream out = new FileOutputStream("D:\\logo.png");
+            int j = 0;
+            while ((j = inputStream.read()) != -1) {
+                out.write(j);
+            }
+            inputStream.close();
+
+
             //qrcFile用来存放生成的二维码图片（无logo，无文字）
 //            File qrcFile = new File(path1, name + "123.jpg");
             //logoFile用来存放带有logo的二维码图片（二维码+logo，无文字）
-            File logoFile = new File(path1);
+            File logoFile = new File("D:\\", "logo.png");
 
             LogoConfig logoConfig = new LogoConfig(); //LogoConfig中设置Logo的属性
             File file1 = addLogo_QRCode(file, logoFile, logoConfig,name);
@@ -164,4 +179,6 @@ public class QRCodeUtil implements InitializingBean {
         ossClient.putObject(putObjectRequest);
         return baseUrl + "QRCode/" + sendCarNo+".png";
     }
+
+
 }

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

@@ -10,7 +10,8 @@
         WHERE delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
-                AND status='待结算'
+                AND status='待结算'  and( approve_status= ''
+                or approve_status is null)
             </if>
             <if test="searchType == 3">
                 AND actual_collectionment-amount_ed_collectionable>0
@@ -89,12 +90,14 @@
         status,
         approve_status as approveStatus,
         status_flag as statusFlag,
+        update_date as updateDate,
         workflow_id as workflowId
         FROM payment_management
         WHERE delete_flag = '0'
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
-                AND status='待结算'
+                AND status='待结算'  and( approve_status= ''
+                or approve_status is null)
             </if>
             <if test="searchType == 3">
                 AND actual_collectionment-amount_ed_collectionable>0