任务类型修改

pengcheng
1 parent 772c3ef2
Showing 2 changed files with 4 additions and 4 deletions
src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
@@ -130,16 +130,16 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
     @Override
     public List<InventoryDetail> selectBysql(String sql, ShipmentDetail shipmentDetail, String sqll, ShipmentPreference shipmentPreference) {
-       if(shipmentPreference.getAllowQcCheckResult() == true) {
+       if(shipmentPreference.getAllowQcCheckResult() == false) {
            sql = sql + " \n" + "and warehouseCode='" + shipmentDetail.getWarehouseCode() + "' \n" +
                    "and companyCode='" + shipmentDetail.getCompanyCode() + "' \n" +
                    "and materialCode='" + shipmentDetail.getMaterialCode() + "' \n" +
-                   "and inventorySts='" + shipmentDetail.getInventorySts() + "'\n"+
                    "and inventorySts='" + shipmentDetail.getInventorySts() + "'\n"+ sqll;
        }else {
            sql = sql + " \n" + "and warehouseCode='" + shipmentDetail.getWarehouseCode() + "' \n" +
                    "and companyCode='" + shipmentDetail.getCompanyCode() + "' \n" +
                    "and materialCode='" + shipmentDetail.getMaterialCode() + "' \n" +
+                   "and inventorySts='" + shipmentDetail.getInventorySts() + "'\n"+
                    "and qcCheck=1\n"+ sqll;
        }
         return inventoryDetailMapper.selectBysql(sql);
@@ -425,11 +425,11 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
     @Transactional
     public void completeTask(TaskHeader task) {
         //区分任务类型
-        if (task.getTaskType() == 100) {
+        if (task.getInternalTaskType() == 100) {
             //入库任务
             completeReceiptTask(task);
         }
-        if (task.getTaskType() == 200) {
+        if (task.getInternalTaskType() == 200) {
 //            出库任务
             completeShipmentTask(task);
         }