wzy 2 weeks ago
parent
commit
960eca5ffc

+ 18 - 0
mjava-diwei/src/main/java/com/malk/diwei/controller/DiweiController.java

@@ -34,6 +34,12 @@ public class DiweiController {
     @Autowired
     private DiweiService diweiService;
 
+    @Autowired
+    private ColorService colorService;
+
+    @Autowired
+    private SizeService sizeService;
+
     //同步客户
     @GetMapping("/syncClient")
     public McR syncClient() {
@@ -94,6 +100,18 @@ public class DiweiController {
         return processService.syncProcessOn2();
     }
 
+    //同步颜色
+    @GetMapping("/syncColor")
+    public McR syncColor(){
+        return colorService.syncColor();
+    }
+
+    //同步尺码
+    @GetMapping("/syncSize")
+    public McR syncSize(){
+        return sizeService.syncSize();
+    }
+
     //同步所有基础数据
     @Scheduled(cron = "0 0 0 * * ?")
     @GetMapping("/syncBaseAll")

+ 1 - 1
mjava-diwei/src/main/java/com/malk/diwei/entity/Color.java

@@ -27,7 +27,7 @@ import lombok.Setter;
 
     private String colorName;
 
-    private Boolean colorIsDisable;
+    private Integer colorIsDisable;
 
     private Integer colorSequence;
 

+ 2 - 0
mjava-diwei/src/main/java/com/malk/diwei/entity/Employee.java

@@ -37,6 +37,8 @@ import lombok.Setter;
 
     private Integer empIsSalesman;
 
+    private Integer empIsDesigner;
+
     private Long jobID;
 
     private Integer empIsQCMerchandiser;

+ 74 - 0
mjava-diwei/src/main/java/com/malk/diwei/entity/ProcessONDetail.java

@@ -0,0 +1,74 @@
+package com.malk.diwei.entity;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author WZY
+ * @since 2025-04-09
+ */
+@TableName("ProcessONDetail")
+@Data
+  public class ProcessONDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+      private Long processONDetailID;
+
+    private Date processONDetailDate;
+
+    private Integer processONDetailType;
+
+    private Long processID;
+
+    private Long processItemID;
+
+    private Long pCNODColorID;
+
+    private Long pCNODSizeID;
+
+    private Long processONDetailQty;
+
+    private BigDecimal processONDetailWeight;
+
+    private String processONDetailDes;
+
+    private Long processONDetailCreatID;
+
+    private Date processONDetailCreatDate;
+
+    private Long processONDetailUpdateID;
+
+    private Date processONDetailUpdateDate;
+
+    private Integer processONDetailReceiptWay;
+
+    private String pCONDPackageBarCode;
+
+    private String processONDetailCode;
+
+    private Long processONDetailReWorkQty;
+
+    private Long processONDetailReferID;
+
+    private Long processONDetailReWorkConfirmQty;
+
+    private String processONDetailDes2;
+
+    private Long processONDetailBeyondQty;
+
+    private Long processONDetailReturnQty;
+
+    private BigDecimal processONDetailOrderWeight;
+}

+ 1 - 1
mjava-diwei/src/main/java/com/malk/diwei/entity/Size.java

@@ -27,7 +27,7 @@ import lombok.Setter;
 
     private String sizeName;
 
-    private Boolean sizeIsDisable;
+    private Integer sizeIsDisable;
 
     private Integer sizeSequence;
 

+ 18 - 0
mjava-diwei/src/main/java/com/malk/diwei/mapper/ProcessONDetailMapper.java

@@ -0,0 +1,18 @@
+package com.malk.diwei.mapper;
+
+import com.malk.diwei.entity.ProcessONDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author WZY
+ * @since 2025-04-09
+ */
+@Mapper
+public interface ProcessONDetailMapper extends BaseMapper<ProcessONDetail> {
+
+}

+ 9 - 0
mjava-diwei/src/main/java/com/malk/diwei/service/ColorService.java

@@ -0,0 +1,9 @@
+package com.malk.diwei.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.malk.diwei.entity.Color;
+import com.malk.server.common.McR;
+
+public interface ColorService extends IService<Color> {
+    McR syncColor();
+}

+ 16 - 0
mjava-diwei/src/main/java/com/malk/diwei/service/ProcessONDetailService.java

@@ -0,0 +1,16 @@
+package com.malk.diwei.service;
+
+import com.malk.diwei.entity.ProcessONDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author WZY
+ * @since 2025-04-09
+ */
+public interface ProcessONDetailService extends IService<ProcessONDetail> {
+
+}

+ 10 - 0
mjava-diwei/src/main/java/com/malk/diwei/service/SizeService.java

@@ -0,0 +1,10 @@
+package com.malk.diwei.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.malk.diwei.entity.Size;
+import com.malk.server.common.McR;
+
+public interface SizeService extends IService<Size> {
+    McR syncSize();
+
+}

+ 61 - 0
mjava-diwei/src/main/java/com/malk/diwei/service/impl/ColorServiceImpl.java

@@ -0,0 +1,61 @@
+package com.malk.diwei.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.malk.diwei.entity.Color;
+import com.malk.diwei.entity.Employee;
+import com.malk.diwei.mapper.ColorMapper;
+import com.malk.diwei.service.ColorService;
+import com.malk.server.aliwork.YDConf;
+import com.malk.server.aliwork.YDParam;
+import com.malk.server.common.McR;
+import com.malk.service.aliwork.YDClient;
+import com.malk.utils.UtilMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class ColorServiceImpl extends ServiceImpl<ColorMapper, Color> implements ColorService{
+    @Autowired
+    private ColorMapper colorMapper;
+
+    @Autowired
+    private YDClient ydClient;
+
+
+    @Override
+    public McR syncColor() {
+        LambdaQueryWrapper<Color> colorLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        colorLambdaQueryWrapper.isNotNull(Color::getColorCode)
+                .ne(Color::getColorCode,"");
+        List<Color> colorList = colorMapper.selectList(colorLambdaQueryWrapper);
+
+        for (Color color : colorList) {
+            Map formData = new HashMap();
+
+            formData.put("textField_mb06w633",color.getColorName());//名称
+            formData.put("textField_mb06w632",color.getColorCode());//颜色编号
+            formData.put("numberField_mb06w62x",color.getColorID());//颜色id
+            formData.put("selectField_mb06w634",color.getColorIsDisable() == 0 ? "正常" : "停用");//状态
+
+
+            //精准匹配
+            List<Map> jsonString = new ArrayList<>();
+            jsonString.add(UtilMap.map("key, value, type, operator, componentName", "textField_mb06w632",color.getColorCode(),"TEXT","eq","TextField"));
+
+            ydClient.operateData(YDParam.builder()
+                    .formUuid("FORM-83F892EA77F64C63B9071430A130865CF08O")
+                    .searchCondition(JSONObject.toJSONString(jsonString))
+                    .formDataJson(JSONObject.toJSONString(formData))
+                    .build(), YDConf.FORM_OPERATION.upsert);
+
+        }
+        return McR.success();
+    }
+}

+ 1 - 0
mjava-diwei/src/main/java/com/malk/diwei/service/impl/EmployeeServiceImpl.java

@@ -47,6 +47,7 @@ public class EmployeeServiceImpl extends ServiceImpl<EmployeeMapper, Employee> i
             formData.put("radioField_m8msenya",employee.getEmpSex().equals("M") ? "男" : "女");//员工性别
             formData.put("numberField_m8msenyl",employee.getDeptID());//部门id
             formData.put("selectField_m8msenyb",employee.getEmpIsSalesman() == 1 ? "是" : "否");//业务员
+            formData.put("selectField_maz5ds8l",employee.getEmpIsDesigner() == 1 ? "是" : "否");//设计师
             formData.put("numberField_m8mu7y3d",employee.getJobID());//职位id
             formData.put("selectField_m8msenyj",employee.getEmpIsQCMerchandiser() != null && employee.getEmpIsQCMerchandiser() == 1 ? "是" : "否");//QC跟单
             formData.put("selectField_m8msenyk",employee.getEmpWorkStatus() == 1 ? "正常" : "停用");//状态

+ 20 - 0
mjava-diwei/src/main/java/com/malk/diwei/service/impl/ProcessONDetailServiceImpl.java

@@ -0,0 +1,20 @@
+package com.malk.diwei.service.impl;
+
+import com.malk.diwei.entity.ProcessONDetail;
+import com.malk.diwei.mapper.ProcessONDetailMapper;
+import com.malk.diwei.service.ProcessONDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author WZY
+ * @since 2025-04-09
+ */
+@Service
+public class ProcessONDetailServiceImpl extends ServiceImpl<ProcessONDetailMapper, ProcessONDetail> implements ProcessONDetailService {
+
+}

+ 57 - 0
mjava-diwei/src/main/java/com/malk/diwei/service/impl/SizeServiceImpl.java

@@ -0,0 +1,57 @@
+package com.malk.diwei.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.malk.diwei.entity.Color;
+import com.malk.diwei.entity.Size;
+import com.malk.diwei.mapper.SizeMapper;
+import com.malk.diwei.service.SizeService;
+import com.malk.server.aliwork.YDConf;
+import com.malk.server.aliwork.YDParam;
+import com.malk.server.common.McR;
+import com.malk.service.aliwork.YDClient;
+import com.malk.utils.UtilMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class SizeServiceImpl extends ServiceImpl<SizeMapper, Size> implements SizeService {
+    @Autowired
+    private SizeMapper sizeMapper;
+
+    @Autowired
+    private YDClient ydClient;
+
+    @Override
+    public McR syncSize() {
+        List<Size> sizeList = sizeMapper.selectList(null);
+
+        for (Size size : sizeList) {
+            Map formData = new HashMap();
+
+            formData.put("textField_mb08mev5",size.getSizeName());//名称
+            formData.put("textField_mb08mev4",size.getSizeCode());//尺码编号
+            formData.put("numberField_mb08mev3",size.getSizeID());//尺码id
+            formData.put("selectField_mb08mev6",size.getSizeIsDisable() == 0 ? "正常" : "停用");//状态
+
+
+            //精准匹配
+            List<Map> jsonString = new ArrayList<>();
+            jsonString.add(UtilMap.map("key, value, type, operator, componentName", "textField_mb08mev4",size.getSizeCode(),"TEXT","eq","TextField"));
+
+            ydClient.operateData(YDParam.builder()
+                    .formUuid("FORM-63F2679C18914FCB8D5FCF120FB331785WBN")
+                    .searchCondition(JSONObject.toJSONString(jsonString))
+                    .formDataJson(JSONObject.toJSONString(formData))
+                    .build(), YDConf.FORM_OPERATION.upsert);
+
+        }
+        return McR.success();
+    }
+}

+ 5 - 0
mjava-diwei/src/main/resources/mapper/ProcessONDetailMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.malk.diwei.mapper.ProcessONDetailMapper">
+
+</mapper>