From ada770bab40c754393b7649659602d05f18d63d5 Mon Sep 17 00:00:00 2001 From: yinq <1345442242@qq.com> Date: Fri, 25 Nov 2022 13:34:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=8A=A0=E6=9D=90=E8=B4=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/anomaly/dto/QualitySystemDto.java | 6 ++++++ .../mesnac/anomaly/model/AbnormalBill.java | 17 ++++++++++++++++- .../anomaly/service/impl/YunBpmServiceImpl.java | 7 +++++-- .../mesnac/meapi/controller/ItemController.java | 13 +++++++++++++ .../mesnac/meapi/mapper/ItemMapper.java | 7 ++++++- .../mesnac/meapi/service/ItemService.java | 7 ++++++- .../meapi/service/impl/ItemServiceImpl.java | 15 +++++++++++++++ meapi/src/main/resources/mapper/ItemMapper.xml | 17 +++++++++++++++++ 8 files changed, 84 insertions(+), 5 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/QualitySystemDto.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/QualitySystemDto.java index 7bea34c2..51fbb7e7 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/QualitySystemDto.java +++ b/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; + } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java index 0e1a57e7..efc62a13 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/model/AbnormalBill.java @@ -282,6 +282,13 @@ public class AbnormalBill extends Model { */ @TableField(exist = false) private String itemDescription; + + /** + * 材质 + */ + @TableField(exist = false) + private String texture; + @TableField("USER_CON_TIME") private LocalDateTime userConTime; @TableField("USER_IS_CON") @@ -289,7 +296,15 @@ public class AbnormalBill extends Model { private String disRouterBo; - public String getDisRouterBo() { + public String getTexture() { + return texture; + } + + public void setTexture(String texture) { + this.texture = texture; + } + + public String getDisRouterBo() { return disRouterBo; } diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/YunBpmServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/YunBpmServiceImpl.java index 6ca4fb68..d1de29da 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/YunBpmServiceImpl.java +++ b/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){ diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java index 19403551..d9b61083 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java +++ b/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()); + } + } + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ItemMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ItemMapper.java index eab94137..fa41b6ab 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ItemMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ItemMapper.java @@ -33,5 +33,10 @@ public interface ItemMapper extends BaseMapper { Map findMapByItem(@Param("itemBo")String itemBo); - + /** + * 根据物料找出对应材质 + * @param paramMap + * @return + */ + Map findTextureByItemBo(Map paramMap); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ItemService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ItemService.java index 1d0cf80c..29e0267b 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ItemService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ItemService.java @@ -39,5 +39,10 @@ public interface ItemService extends IService { Map findMapByItemBo(String itemBo); - + /** + * 根据物料找出对应材质 + * @param paramMap + * @return + */ + Map findTextureByItemBo(Map paramMap); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ItemServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ItemServiceImpl.java index 74a5214d..e5c09aff 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ItemServiceImpl.java +++ b/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 implements It return itemMapper.findMapByItem(itemBo); } + /** + * 根据物料找出对应材质 + * @param paramMap + * @return + */ + @Override + public Map findTextureByItemBo(Map paramMap) { + String site = CommonMethods.getSite(); + paramMap.put("site", site); + paramMap.put("locale", LocaleContextHolder.getLocale().getLanguage()); + Map map = itemMapper.findTextureByItemBo(paramMap); + return map; + } + } \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/ItemMapper.xml b/meapi/src/main/resources/mapper/ItemMapper.xml index e0a2ad51..2925fbbd 100644 --- a/meapi/src/main/resources/mapper/ItemMapper.xml +++ b/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} +