1.推送上料计划到料场

src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java

@@ -4,12 +4,15 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
+import com.dsic.gj_erp.bean.kc.SlKc;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Getter
 @Setter
 @TableName("im_slxx")
+@NoArgsConstructor
 public class Sljh {
     @TableId(type = IdType.AUTO)
     private Integer slid;
@@ -51,14 +54,39 @@ public class Sljh {
     private String lrrq;//导入日期
 
 
+    public Sljh(SlKc slKc){
+        this.lsh="";//fixme 交换码（单张板唯一码）2200049281年度+流水号
+        this.ysch=slKc.getDcTpbh();
+        this.czbh=slKc.getDCCH();
+        this.ql=slKc.getDzwz();
+        this.hth=slKc.getDcFd();//购单号
+        this.ghsbm=slKc.getGHSBM();//供货商--带到出库接口中-用于成本
+        this.xhth=slKc.getGCDDH();//合同号
+        this.wlbm=slKc.getLPH();//物料号-炉批号
+        this.wph=slKc.getWPH();//物品号
+        this.wpmc=slKc.getWPMC();//物品名称
+        this.wpgg=slKc.getWPGG();//物品规格
+        this.t="";//fixme 物品名称
+        this.b="";//fixme 物品名称
+        this.l="";//fixme 物品名称
 
-    public static Sljh ofWithYdjh(DmYdjh ydjh){
+        this.sllsh=slKc.getSllsh();//上料流水号（20230322001）
-        Sljh sljh=new Sljh();
+        this.ylzl="";//fixme 领用重量(KG)
-        sljh.dcCh=ydjh.getDcCh();
+        this.kwh=slKc.getKWH();//垛位
-        sljh.dcPl=ydjh.getDcPl();
+        this.kwcs=slKc.getCFCS1();//垛位层数01/02/03等
-        sljh.dcLx=ydjh.getLx();
+
-        sljh.dcKw=ydjh.getKw();
+        this.dcCh=slKc.getZYCH();//需求船只
-        sljh.dcPw=ydjh.getPw();
+        this.dcPl=slKc.getZYPL();//需求批量
-        return sljh;
+        this.dcLx=slKc.getZYLX();
+        this.dcKw=slKc.getSLDW();//切割跨位
+        this.dcPw=slKc.getPwwz();//抛丸位置
+
+        this.ddlsh="";//fixme 订单流水号--带到出库接口中-用于成本
+        this.ddxh="";//fixme 订单序号--带到出库接口中-用于成本
+        this.wpzt="";//fixme 物品状态--新增
+        this.lrry=slKc.getDyry();//导入人员
+        this.lrrq=slKc.getDyrq();//导入日期
     }
+
+
 }

src/main/java/com/dsic/gj_erp/bean/kc/SlKc.java

@@ -67,6 +67,7 @@ public class SlKc {
     private Integer xh;
     private String cz;
     private String pwbz;
+    private String GHSBM;
 
     private List<SlKc> list;
 }

src/main/java/com/dsic/gj_erp/config/RestTemplateConfig.java

@@ -0,0 +1,15 @@
+package com.dsic.gj_erp.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+@Configuration
+public class RestTemplateConfig {
+
+    @Bean
+    public RestTemplate restTemplate() {
+        return new RestTemplate();
+    }
+}
+

src/main/java/com/dsic/gj_erp/jiuzhou/SlPlanEvent.java

@@ -0,0 +1,18 @@
+package com.dsic.gj_erp.jiuzhou;
+
+import com.dsic.gj_erp.bean.kc.SlKc;
+import lombok.Getter;
+import org.springframework.context.ApplicationEvent;
+
+import java.util.List;
+
+@Getter
+public class SlPlanEvent extends ApplicationEvent {
+
+    private final List<SlKc> slKcList;
+
+    public SlPlanEvent(Object source,List<SlKc> slKcList) {
+        super(source);
+        this.slKcList=slKcList;
+    }
+}

src/main/java/com/dsic/gj_erp/service/jiuzhou/SljhService.java

@@ -1,30 +1,54 @@
 package com.dsic.gj_erp.service.jiuzhou;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsic.gj_erp.bean.jhgk.DmYdjh;
 import com.dsic.gj_erp.bean.jiuzhou.Sljh;
+import com.dsic.gj_erp.jiuzhou.SlPlanEvent;
 import com.dsic.gj_erp.jiuzhoumapper.SljhMapper;
+import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.event.EventListener;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 
 import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Slf4j
-//@Service
+@Service
+@RequiredArgsConstructor
 public class SljhService extends ServiceImpl<SljhMapper, Sljh> {
 
+    @Value("${api-central.jiuzhou.sl-plan}")
+    String slPlanUrl;
+
+    private final RestTemplate restTemplate;
+
     @Async
     @EventListener
-    public void save(List<DmYdjh> slYdjh){
+    public void save(SlPlanEvent slYdjh){
-        log.info("开始执行九州接口推送:{}",slYdjh);
+        log.info("开始执行九州接口推送");
-        List<Sljh> collect = slYdjh.stream().map(Sljh::ofWithYdjh).collect(Collectors.toList());
+        List<Sljh> collect = slYdjh.getSlKcList().stream().map(Sljh::new).collect(Collectors.toList());
-        log.info("生成九州数据完成:{}",collect);
+        log.info("生成九州数据完成:{},开始推送",collect);
         try {
-            this.saveBatch(collect);
+            HttpHeaders headers = new HttpHeaders();
+            headers.set("Content-Type", "application/json");
+            headers.set("Accept-Language", "zh-CHS");
+            headers.set("X-ECC-Current-Tenant", "10000");
+            headers.set("Authorization", "Bearer 10473672-12a5-2432-c1f1-1c865a814ece");
+            HttpEntity<List<Sljh>> entity = new HttpEntity<>(collect,headers);
+            restTemplate.exchange(slPlanUrl, HttpMethod.POST, entity, JSONObject.class);
         }catch (Exception e){
-            e.printStackTrace();
+            log.error("推送失败",e);
+            return;
         }
         log.info("推送完成");
     }

src/main/resources/application.properties

@@ -51,5 +51,5 @@ spring.resources.static-locations=file:./static,file:D:/??????/static/upload/TWD
 
 pdfUri=D:/javaweb/static/upload
 
-
+api-central.jiuzhou.sl-plan=http://127.0.0.1:8182/jiuZhou/slPlan
 

src/main/resources/mappers/kc/ImCkwpkwp.xml

@@ -8,6 +8,7 @@
         SELECT     (IM_CKWPKWP.KWH) AS KWH ,
                    IM_CKWPKWP.SXRQ ,
                    MS_DDJBP1.dzwz,
+                   MS_DDJBP1.GHSBM,
                    (IM_CKWPKWP.NBSBM) AS NBSBM ,
                    (IM_CKWPKWP.BSBS) AS BSBS ,
                    (IM_CKWPKWP.BSSCH) AS BSSCH ,
@@ -63,14 +64,13 @@
                    sllsh,
                    dyry,
                    dyrq,
-        IM_CKWPKWP.ydid,
+                   IM_CKWPKWP.ydid,
                    'N' as bs,
                    'N' as bs_all
-
         FROM IM_CKWPKWP
                  join DM_WPJBP on((IM_CKWPKWP.WPH) = (DM_WPJBP.WPH))
                  left join (select MS_DDJBP.dzwz,
-                                   MS_DDJBP.ddmc,MS_DDMXP.dc_ch
+                                   MS_DDJBP.ddmc,MS_DDMXP.dc_ch,MS_DDJBP.GHSBM
                             from MS_DDJBP,MS_DDMXP
                             where  MS_DDJBP.CGFLM = MS_DDMXP.CGFLM and MS_DDJBP.DDH = MS_DDMXP.DDH
                               and MS_DDJBP.CGFLM = '01' and MS_DDJBP.DDLX = 'B') as MS_DDJBP1 on(IM_CKWPKWP.gcddh =MS_DDJBP1.dc_ch )