异常加材质

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/QualitySystemDto.java

@@ -216,4 +216,10 @@ public class QualitySystemDto {
      */
     private String programme_sign_man;//方案会签人
 
+
+    /**
+     * 材质
+     */
+    private String texture;
+
 }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java

@@ -282,6 +282,13 @@ public class AbnormalBill extends Model<AbnormalBill> {
     */
    @TableField(exist = false)
    private String itemDescription;
+
+   /**
+    * 材质
+    */
+   @TableField(exist = false)
+   private String texture;
+
     @TableField("USER_CON_TIME")
     private LocalDateTime userConTime;
     @TableField("USER_IS_CON")
@@ -289,6 +296,14 @@ public class AbnormalBill extends Model<AbnormalBill> {
 
     private String disRouterBo;
 
+   public String getTexture() {
+      return texture;
+   }
+
+   public void setTexture(String texture) {
+      this.texture = texture;
+   }
+
    public String getDisRouterBo() {
         return disRouterBo;
     }

anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/YunBpmServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.http.HttpUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.ValueFilter;
 import com.foreverwin.mesnac.anomaly.dto.QualitySystemDto;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBill;
 import com.foreverwin.mesnac.anomaly.model.AbnormalBillDispose;
@@ -44,6 +45,8 @@ public class YunBpmServiceImpl implements YunBpmService {
     private final static String DEFAULT_ACTION_CODE = "submit";
     private final static Boolean DEFAULT_AGREE = true;
     private final static String DEFAULT_FORM_TYPE = "1";
+
+    private static ValueFilter valueFilter = (o, s, data) -> data == "" ? null : data;
     @Override
     public YunBpmApiRes saveForm(Object formData, String owner, String ownerDeptId, String sheetCode, String workflowCode, String replayToken, String accessToken) {
         return saveOrUpdateForm(formData, owner, ownerDeptId, sheetCode, workflowCode, null, null, null, replayToken, accessToken);
@@ -73,6 +76,7 @@ public class YunBpmServiceImpl implements YunBpmService {
                 .item_number(abnormalBill.getItemNumber()).product_category(abnormalBill.getProductCategory())
                 .submission_users(abnormalBill.getReportSendUserGroup()).working_procedure_code(abnormalBill.getOperation())
                 .submission_man_employee_no(abnormalBill.getPbUser()).test_user_employeeNo(abnormalBill.getInspector())
+                .texture(abnormalBill.getTexture())
                 //不良明细
                 .problem_description(abnormalBill.getPbDescription()).problem_number(abnormalBill.getPbQty())
                 .discover_link(abnormalBill.getDiscover()).entity_location(abnormalBill.getEntityLocation())
@@ -91,8 +95,7 @@ public class YunBpmServiceImpl implements YunBpmService {
                  .abnormalbill_reason().preventive_measure().rectification_record_photos(null)*/
                  .build();
 
-        System.out.println(qualitySystemDto);
-        String jsonString = JSONObject.toJSONString(qualitySystemDto);
+        String jsonString = JSONObject.toJSONString(qualitySystemDto,valueFilter);
         JSONObject qualitySystem = JSONObject.parseObject(jsonString);
         OAuthTokenInfo auth = getTokenByUserNameAndPassword(yunBpmConfig.userName, yunBpmConfig.passWord);
         if(null == auth){

meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author Ervin Chen
@@ -107,4 +108,16 @@ public class ItemController {
         return R.ok(itemService.findMapByItemBo(itemBo));
     }
 
+    /**
+     * 根据物料找出对应材质
+     */
+    @GetMapping("/findTextureByItemBo")
+    public R findTextureByItemBo(@RequestParam(required = false) Map paramMap){
+        try{
+            return R.ok(itemService.findTextureByItemBo(paramMap));
+        }catch (Exception e){
+            return R.failed(e.getMessage());
+        }
+    }
+
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ItemMapper.java

@@ -33,5 +33,10 @@ public interface ItemMapper extends BaseMapper<Item> {
 
     Map<String,Object> findMapByItem(@Param("itemBo")String itemBo);
 
-
+    /**
+     * 根据物料找出对应材质
+     * @param paramMap
+     * @return
+     */
+    Map<String, String> findTextureByItemBo(Map paramMap);
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ItemService.java

@@ -39,5 +39,10 @@ public interface ItemService extends IService<Item> {
 
     Map<String,Object> findMapByItemBo(String itemBo);
 
-
+    /**
+     * 根据物料找出对应材质
+     * @param paramMap
+     * @return
+     */
+    Map<String,String> findTextureByItemBo(Map paramMap);
 }

meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ItemServiceImpl.java

@@ -10,6 +10,7 @@ import com.foreverwin.mesnac.meapi.mapper.ItemMapper;
 import com.foreverwin.mesnac.meapi.model.Item;
 import com.foreverwin.mesnac.meapi.service.ItemService;
 import com.foreverwin.mesnac.meapi.util.StringUtils;
+import com.foreverwin.modular.core.util.CommonMethods;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Service;
@@ -91,5 +92,19 @@ public class ItemServiceImpl extends ServiceImpl<ItemMapper, Item> implements It
         return itemMapper.findMapByItem(itemBo);
     }
 
+    /**
+     * 根据物料找出对应材质
+     * @param paramMap
+     * @return
+     */
+    @Override
+    public Map<String, String> findTextureByItemBo(Map paramMap) {
+        String site = CommonMethods.getSite();
+        paramMap.put("site", site);
+        paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage());
+        Map<String, String> map = itemMapper.findTextureByItemBo(paramMap);
+        return map;
+    }
+
 
 }

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

@@ -1021,5 +1021,22 @@
         LEFT JOIN CUSTOM_FIELDS DWG ON DWG.HANDLE = I.HANDLE AND DWG."ATTRIBUTE" = 'DWG_NO'
         WHERE I.HANDLE = #{itemBo}
     </select>
+    <select id="findTextureByItemBo" resultType="java.util.Map">
+        SELECT CP.SITE, IM.ITEM, MAX(C3.VALUE) TEXTURE
+        FROM Z_SFC_DISPATCH SD
+                 INNER JOIN SFC SC ON SC.SITE = SD.SITE AND SC.SFC = SD.SFC
+                 INNER JOIN SHOP_ORDER SO ON SO.SITE = SD.SITE AND SO.SHOP_ORDER = SD.SHOP_ORDER
+                 INNER JOIN SFC_BOM SB ON SB.SFC_BO = SC.HANDLE
+                 INNER JOIN BOM_COMPONENT BC ON BC.BOM_BO = SB.BOM_BO
+                 INNER JOIN ITEM IM ON IM.HANDLE = SO.ITEM_BO
+                 LEFT JOIN ITEM CP ON CP.HANDLE = BC.COMPONENT_GBO
+                 LEFT JOIN CUSTOM_FIELDS C3 ON C3.HANDLE = CP.HANDLE AND C3.ATTRIBUTE = 'TEXTTURE'
+        WHERE C3.VALUE IS NOT NULL
+        AND SD.SITE = #{site}
+        <if test="itemBo != null and itemBo != ''">
+            AND IM.HANDLE = #{itemBo}
+        </if>
+        GROUP BY CP.SITE, IM.ITEM
+    </select>
 
 </mapper>