huangfuli пре 3 година
родитељ
комит
aa495be467

+ 10 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WeighingManagementController.java

@@ -126,5 +126,15 @@ public class WeighingManagementController {
     public String weightReturn(@RequestBody WeighingManagement weighingManagement) {
         return weighingManagementService.weightReturn(weighingManagement);
     }
+
+    /**
+     * 换仓
+     * @param weighingManagement
+     * @return
+     */
+    @PostMapping("/api/changeWarehouse")
+    public String changeWarehouse(@RequestBody WeighingManagement weighingManagement) {
+        return weighingManagementService.changeWarehouse(weighingManagement);
+    }
 }
 

+ 10 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WeighingManagement.java

@@ -408,6 +408,16 @@ public class WeighingManagement extends BaseModel<WeighingManagement> {
      */
     @TableField(exist = false)
     private String warehouseNo;
+    /**
+     * 换仓仓位编号
+     */
+    @TableField(exist = false)
+    private String changeBinNumer;
+    /**
+     * 换仓仓位id
+     */
+    @TableField(exist = false)
+    private String changePositionId;
     @Override
     protected Serializable pkVal() {
         return this.id;

+ 7 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IWeighingManagementService.java

@@ -72,4 +72,11 @@ public interface IWeighingManagementService extends IService<WeighingManagement>
      */
     String weightReturn(WeighingManagement weighingManagement);
 
+    /**
+     * 换仓
+     * @param
+     * @return
+     */
+    String changeWarehouse(WeighingManagement weighingManagement);
+
 }

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

@@ -651,4 +651,39 @@ public class WeighingManagementServiceImpl extends ServiceImpl<WeighingManagemen
         }
         return "OK";
     }
+
+    /**
+     * 换仓
+     * @param
+     * @return
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String changeWarehouse(WeighingManagement weighingManagement) {
+        //查询检斤信息
+        WeighingManagement weighingManagement1 = this.selectById(weighingManagement.getId());
+        if (weighingManagement1 != null){
+            weighingManagement1.setBinNumber(weighingManagement.getChangeBinNumer());
+            weighingManagement1.setPositionId(weighingManagement.getChangePositionId());
+            this.updateById(weighingManagement1);
+        }
+        //查询质检信息
+        QualityInspectionManagement qualityInspectionManagement = qualityInspectionManagementService.selectOne(new EntityWrapper<QualityInspectionManagement>()
+                .eq("relation_id",weighingManagement1.getRelationId())
+                .eq("delete_flag","0"));
+        if (qualityInspectionManagement != null){
+            qualityInspectionManagement.setBinNumber(weighingManagement.getChangeBinNumer());
+            qualityInspectionManagementService.updateById(qualityInspectionManagement);
+        }
+        //查询出入库信息
+        WarehouseInOutInfo warehouseInOutInfo = warehouseInOutInfoService.selectOne(new EntityWrapper<WarehouseInOutInfo>()
+                .eq("id",weighingManagement1.getWarehouseInOutId())
+                .eq("delete_flag","0"));
+        if (warehouseInOutInfo != null){
+            warehouseInOutInfo.setBinNumber(weighingManagement.getChangeBinNumer());
+            warehouseInOutInfo.setPositionId(weighingManagement.getChangePositionId());
+            warehouseInOutInfoService.updateById(warehouseInOutInfo);
+        }
+        return "ok";
+    }
 }