change - 质检查询显示成品型号

aucma-api/src/main/java/com/aucma/api/controller/PdaApiController.java

@@ -120,7 +120,9 @@ public class PdaApiController {
             ReportQualityInspection inspection = new ReportQualityInspection();
             inspection.setBarCode(checkInfo.getCode());
 
-            inspection.setMaterialName(checkInfo.getName());
+            String boxName = service.selectBoxNameBarCode(checkInfo.getCode());
+            inspection.setMaterialName(boxName);
+
             String measure = checkInfo.getMeasure();
             inspection.setTreatmentMeasure(measure);
             if (measure.equals("3")) {

aucma-api/src/main/java/com/aucma/api/mapper/PdaBindingMapper.java

@@ -72,4 +72,5 @@ public interface PdaBindingMapper {
     List<HashMap<String, String>> messageNotifications(@Param("userName") String userName);
 
 
+    String selectBoxNameBarCode(String boxCode);
 }

aucma-api/src/main/java/com/aucma/api/service/IPdaBindingService.java

@@ -11,8 +11,21 @@ import java.util.List;
  * @date 2023/11/14  9:56
  */
 public interface IPdaBindingService {
+
+    /**
+     * 获取成品码
+     * @param boxCode
+     * @return
+     */
     String selectBoxNameByCode(String boxCode);
 
+    /**
+     * 获取箱体码
+     * @param boxCode
+     * @return
+     */
+    String selectBoxNameBarCode(String boxCode);
+
     int insertBindingInfo(String boxCode, String boxName, String innerCode);
 
     int countQualityRecordByCode(String code);

aucma-api/src/main/java/com/aucma/api/service/impl/PdaServiceImpl.java

@@ -37,8 +37,14 @@ public class PdaServiceImpl implements IPdaBindingService {
 
     @Override
     public String selectBoxNameByCode(String boxCode) {
+//        mapper.selectBoxNameByCode(boxCode.substring(7,17));
+//        select MATERIAL_NAME from BASE_MATERIALINFO where MATERIAL_CODE = #{boxCode}
+        return mapper.selectBoxNameByCode(boxCode);
+    }
 
-        return mapper.selectBoxNameByCode(boxCode.substring(7,17));
+    @Override
+    public String selectBoxNameBarCode(String boxCode) {
+        return mapper.selectBoxNameBarCode(boxCode.substring(7,17));
     }
 
     @Override

aucma-api/src/main/resources/mapper/PdaBindingMapper.xml

@@ -6,6 +6,13 @@
 
 
     <select id="selectBoxNameByCode" resultType="string">
+        SELECT BO.MATERIAL_NAME
+        FROM C##AUCMA_SCADA.PRINT_BARCODE PB
+                 LEFT JOIN C##AUCMA_MES.BASE_ORDERINFO BO ON BO.ORDER_CODE = PB.ORDER_CODE
+        WHERE PB.MATERIAL_BARCODE = #{boxCode}
+    </select>
+
+    <select id="selectBoxNameBarCode" resultType="string">
         select MATERIAL_NAME from BASE_MATERIALINFO where MATERIAL_CODE = #{boxCode}
     </select>
 
@@ -108,6 +115,7 @@
           AND (rep.INSPECTION_USER_CODE IS NULL OR rep.INSPECTION_USER_CODE NOT LIKE '%' || #{userName} || '%')
     </select>
 
+
     <update id="unbindBarCode">
         UPDATE CODE_BINDING
         SET PRODUCT_CODE = NULL, RECORD_TIME2 = NULL