修改打印材质信息

common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java

@@ -478,11 +478,14 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
             labelPrintDto.setSfc(prodReadyTask.getSfc());
             Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(site, prodReadyTask.getSfc()));
             String drawingRevision = customFieldsService.getCustomFieldsValue(sfcServiceById.getItemBo(), CustomFieldConstant.ITEM_DWG_NO);
-            Map map=new HashMap();
-            map.put("itemBo",selectCurrent.getItem());
-            Map Texturemap = itemService.findTextureByItemBo(map);
             labelPrintDto.setDrawingVersion(drawingRevision);
-            labelPrintDto.setTexture(Texturemap.get("TEXTURE").toString());
+            Map map=new HashMap();
+            map.put("site",site);
+            map.put("item",selectCurrent.getItem());
+            Map TextureMap = itemService.findTextureByItemBo(map);
+            if (TextureMap != null){
+                labelPrintDto.setTexture(String.valueOf(TextureMap.get("TEXTURE")));
+            }
             labelPrintDto.setQty(new BigDecimal(sfcServiceById.getQty()));
             String workOrder = customFieldsService.getCustomFieldsValue(sfcServiceById.getShopOrderBo(), CustomFieldConstant.SO_WORK_ORDER);
             String itemNumber = customFieldsService.getCustomFieldsValue(sfcServiceById.getShopOrderBo(), CustomFieldConstant.SO_ITEM_NUMBER);

meapi/src/main/resources/mapper/ItemMapper.xml

@@ -1036,6 +1036,9 @@
         <if test="itemBo != null and itemBo != ''">
             AND IM.HANDLE = #{itemBo}
         </if>
+        <if test="item != null and item != ''">
+            AND IM.ITEM = #{item}
+        </if>
         GROUP BY CP.SITE, IM.ITEM
     </select>