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

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranCarInfo.java

@@ -37,6 +37,10 @@ public class TranCarInfo extends BaseModel<TranCarInfo> {
      */
     @TableId(type = IdType.UUID)
     private String id;
+    /**
+     * 公司
+     */
+    private String compId;
     /**
      * 运输任务id
      */

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

@@ -84,6 +84,7 @@ public class TranCarInfoServiceImpl extends ServiceImpl<TranCarInfoMapper, TranC
     public String addTranCar(TranCarInfo tranCarInfo) throws ServiceException {
         //新增主键id
         tranCarInfo.setId(IdGenerator.generateUUID());
+        tranCarInfo.setCompId(AuthSecurityUtils.getCurrentUserInfo().getCompId());
         tranCarInfo.setStatus(StatusEnum.NOT_DELIVERED.getName());
         tranCarInfo.setStatusFlag(StatusEnum.NOT_DELIVERED.getFlag());
         tranCarInfo.setConfirmFlag(StatusEnum.NOT_CONFIRM.getFlag());

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

@@ -206,6 +206,8 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                 }
                 //新增
                 if (StringUtils.isEmpty(tranCarInfo.getId())) {
+                    TranTaskInfo tranTaskInfo=tranTaskInfoService.selectById(tranProcessInfo.getInfoId());
+                    tranCarInfo.setCompId(tranTaskInfo.getCompId());
                     //船运集装箱
                     if (tranCarInfoList.get(0).getTranType().equals(NumberConstant.CONSTANT3)&&"集装箱".equals(tranCarInfoList.get(0).getShipType())) {
                         for(int i=0;i<tranCarInfoList.get(0).getBoxNumber();i++){
@@ -225,7 +227,6 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                             tranCarInfo.setSignStatus(StatusEnum.NOT_SIGNED.getName());
                             tranCarInfo.setSignStatusFlag(StatusEnum.NOT_SIGNED.getFlag());
                         }
-                        TranTaskInfo tranTaskInfo = tranTaskInfoService.selectById(tranProcessInfo.getInfoId());
                         tranCarInfo.setContractNo(tranTaskInfo.getContractNo());
                         tranCarInfo.setStatusFlag(StatusEnum.NOT_LOADED.getFlag());
                         tranCarInfo.setStatus(StatusEnum.NOT_LOADED.getName());
@@ -854,6 +855,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
         ContractManagementInfo contractManagementInfo = contractManagementInfoService.selectOne(new EntityWrapper<ContractManagementInfo>()
             .eq("contract_no",tranProcessInfo.getContractNo())
             .eq("delete_flag","0"));
+        TranTaskInfo tranTaskInfo=tranTaskInfoService.selectById(tranProcessInfo.getInfoId());
         //采购
         if("2".equals(contractManagementInfo.getContractType())){
             //更改运输调度发货运输方式
@@ -863,6 +865,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                 for (TranCarInfo tranCarInfo : tranCarInfoList1) {
                     //新增
                     if (StringUtils.isEmpty(tranCarInfo.getId())) {
+                        tranCarInfo.setCompId(tranTaskInfo.getCompId());
                         tranCarInfo.setProcessId(tranProcessInfo.getId());
                         tranCarInfo.setInfoId(tranProcessInfo.getInfoId());
                         tranCarInfo.setId(IdGenerator.generateUUID());
@@ -880,6 +883,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                 for (TranCarInfo tranCarInfo : tranCarInfoList2) {
                     //新增
                     if (StringUtils.isEmpty(tranCarInfo.getId())) {
+                        tranCarInfo.setCompId(tranTaskInfo.getCompId());
                         tranCarInfo.setProcessId(tranProcessInfo.getId());
                         tranCarInfo.setInfoId(tranProcessInfo.getInfoId());
                         tranCarInfo.setId(IdGenerator.generateUUID());
@@ -897,6 +901,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                 for (TranCarInfo tranCarInfo : tranCarInfoList3) {
                     //新增
                     if (StringUtils.isEmpty(tranCarInfo.getId())) {
+                        tranCarInfo.setCompId(tranTaskInfo.getCompId());
                         tranCarInfo.setProcessId(tranProcessInfo.getId());
                         tranCarInfo.setInfoId(tranProcessInfo.getInfoId());
                         tranCarInfo.setId(IdGenerator.generateUUID());
@@ -914,6 +919,7 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
                 for (TranCarInfo tranCarInfo : tranCarInfoList4) {
                     //新增
                     if (StringUtils.isEmpty(tranCarInfo.getId())) {
+                        tranCarInfo.setCompId(tranTaskInfo.getCompId());
                         tranCarInfo.setProcessId(tranProcessInfo.getId());
                         tranCarInfo.setInfoId(tranProcessInfo.getInfoId());
                         tranCarInfo.setId(IdGenerator.generateUUID());

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

@@ -1857,7 +1857,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                 cell.setCellValue(editString(exportVView.getTitleNoOther()));
                 cell.setCellStyle(styleDetail);
                 cell = rowx.createCell(19);
-                cell.setCellValue(Double.parseDouble(exportVView.getNetWeightPrice()));
+                cell.setCellValue(Double.parseDouble(exportVView.getNetWeightPrice()!=null?exportVView.getNetWeightPrice():"0"));
                 cell.setCellStyle(contextstyle);
                 cell = rowx.createCell(20);
                 HSSFDataFormat df = wb.createDataFormat(); // 此处设置数据格式

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

@@ -1051,6 +1051,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
                                     TranCarInfo tranCarInfo = new TranCarInfo();
                                     tranCarInfo.setId(IdGenerator.generateUUID());
                                     tranCarInfo.setProcessId(tranProcessInfo.getId());
+                                    tranCarInfo.setCompId(tranTaskInfo.getCompId());
                                     tranCarInfo.setInfoId(tranProcessInfo.getInfoId());
                                     tranCarInfo.setTranType("4");
                                     tranCarInfo.setSubmit("1");
@@ -1561,6 +1562,8 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
         //  仓库ID
         pageView.put("baseId", warehouseInOutInfo.getBaseId());
         pageView.put("searchType", warehouseInOutInfo.getSearchType());
+        pageView.put("startDate", warehouseInOutInfo.getStartDate());
+        pageView.put("endDate", warehouseInOutInfo.getEndDate());
         pageView.put("pageSize", warehouseInOutInfo.getPageSize());
         pageView.put("currentPage", warehouseInOutInfo.getCurrentPage());
         // 查询记录总数

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

@@ -185,6 +185,14 @@
                 AND w.in_out_flag = '2'
             </if>
         </if>
+        <if test="startDate != null">
+            AND (DATE_FORMAT(w.in_out_date,"%Y%m%d") &gt;=
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
+        </if>
+        <if test="endDate != null">
+            AND (DATE_FORMAT(w.in_out_date,"%Y%m%d") &lt;=
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
+        </if>
     </select>
     <!-- 流转记录列表查询(临时仓库) -->
     <select id="getListByConditionTemporary" parameterType="Map"
@@ -226,6 +234,14 @@
                 AND w.in_out_flag = '2'
             </if>
         </if>
+        <if test="startDate != null">
+            AND (DATE_FORMAT(w.in_out_date,"%Y%m%d") &gt;=
+            DATE_FORMAT(#{startDate},"%Y%m%d"))
+        </if>
+        <if test="endDate != null">
+            AND (DATE_FORMAT(w.in_out_date,"%Y%m%d") &lt;=
+            DATE_FORMAT(#{endDate},"%Y%m%d"))
+        </if>
         ORDER BY w.update_date DESC
         <if test="currentPage != null and currentPage != ''">
             LIMIT ${startRecord}, ${pageSize}