生产管理修改

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/controller/PdaLoadController.java

@@ -5,6 +5,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.device.pojo.entity.EquipmentEntity;
 import org.springblade.desk.device.pojo.entity.FeiBaSetEntity;
@@ -37,7 +38,7 @@ public class PdaLoadController {
     @ApiOperationSupport(order = 1)
     @Operation(summary = "根据流程卡号数据", description  = "传入cardNo")
     public R<BindModelVO> loadBindData(@PathVariable String cardNo) {
-        return R.data(pdaLoadService.loadBindData(1297L, cardNo));
+        return R.data(pdaLoadService.loadBindData(AuthUtil.getUserId(), cardNo));
     }
 
     @GetMapping(value = "/getBsRackSetByCode/{rsCode}")

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/MacToolUseMapper.xml

@@ -49,7 +49,7 @@
         INNER JOIN MES_work_plan b ON a.WP_ID = b.ID
         INNER JOIN MES_WORK_ORDER c ON b.WO_ID = c.ID
         INNER JOIN MES_YIELD_ORDER d ON c.YO_ID = d.ID
-        INNER JOIN DS_PART_BASICS f ON d.part_code = f.part_code
+        INNER JOIN DS_PART f ON d.part_code = f.part_code
         WHERE
         a.MTN_CODE IN ( SELECT a.MTN_CODE FROM MES_MAC_TOOL_USE a LEFT JOIN MES_EQUIPMENT b ON a.EQUIPMENT_CARD =
         b.ID WHERE a.WP_ID = #{id}

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/mapper/WorkPlanMapper.xml

@@ -81,7 +81,7 @@
                   inner join MES_WORK_PLAN b on a.WP_ID = b.ID
                   inner join MES_WORK_ORDER c on b.WO_ID = c.ID
                   inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
-                  inner join DS_PART_BASICS f on d.PART_CODE = f.PART_CODE
+                  inner join DS_PART f on d.PART_CODE = f.PART_CODE
                   where a.MTN_CODE in (
                       select a.MTN_CODE from MES_MAC_TOOL_USE a
                       left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
@@ -106,7 +106,7 @@
                     inner join MES_WORK_PLAN b on a.WP_ID = b.ID
                     inner join MES_WORK_ORDER c on b.WO_ID = c.ID
                     inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
-                    inner join DS_PART_BASICS f on d.PART_CODE = f.PART_CODE
+                    inner join DS_PART f on d.PART_CODE = f.PART_CODE
                     where a.MTN_CODE in (
                     select a.MTN_CODE from MES_MAC_TOOL_USE a
                     left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID
@@ -207,7 +207,7 @@
                          inner join MES_WORK_PLAN b on a.WP_ID = b.ID
                          inner join MES_WORK_ORDER c on b.WO_ID = c.ID
                          inner join MES_YIELD_ORDER d on c.YO_ID = d.ID
-                         inner join DS_PART_BASICS f on d.part_code = f.part_code
+                         inner join DS_PART f on d.part_code = f.part_code
                         where a.MTN_CODE in(
                             select a.MTN_CODE from MES_MAC_TOOL_USE a
                             left join MES_EQUIPMENT_CARD b on a.EQUIPMENT_CARD = b.ID

blade-service/blade-desk/src/main/java/org/springblade/desk/produce/service/impl/PlateAroundServiceImpl.java

@@ -305,7 +305,7 @@ public class PlateAroundServiceImpl extends BaseServiceImpl<PlateAroundMapper, P
                 newPa.setMakeTime(date);
                 newPa.setMakeMan(user.getUserId());
             }
-            newPa.setWpId(wp.getNextWpId());
+            newPa.setWpId(wp.getId());
             newPa.setTsId(wp.getMakeTeam());
             this.updatePrPlateAround(newPa);
             this.save(newPa);