瀏覽代碼

采购入库

chenc 3 年之前
父節點
當前提交
ceadd8281d

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/controller/TestController.java

@@ -32,7 +32,7 @@ public class TestController {
         List<JSONObject> listJSONObject= JsonChangeUtils.toListJson(list);
         result=listJSONObject.get(0);
         //调用采购订单接口测试
-        InterfaceConnUtils.doPostToBearer(result,"https://zoneda.onestep-cloud.com/hitf/v1/rest/invoke?namespace=MFY1001&serverCode=NBSY-ZCOM&interfaceCode=hzmc-communication.senyu-po-interface.createPoInterface");
+//        InterfaceConnUtils.doPostToBearer(result,"https://zoneda.onestep-cloud.com/hitf/v1/rest/invoke?namespace=MFY1001&serverCode=NBSY-ZCOM&interfaceCode=hzmc-communication.senyu-po-interface.createPoInterface");
         return  result;
     }
 }

+ 4 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/mapper/xml/PurchaseWarehousingMapper.xml

@@ -33,7 +33,8 @@
           bRdFlag,<!--收发标志-->
           cSource,<!--单据来源-->
           bTransFlag,<!--是否传递 -->
-          bIsSTQc<!--是否传递 -->
+          bIsSTQc,<!--是否传递 -->
+          cMaker
         )
         VALUES
             (
@@ -57,7 +58,8 @@
                 1,
                 '云工厂',
                 0,
-                0
+                0,
+                '陈创'
         )
     </insert>
     

+ 31 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/PurchaseWarehousingServiceImpl.java

@@ -13,6 +13,8 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -76,7 +78,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                 //获取根据供应商获取仓库编码
                 String cVenCode=String.valueOf(map.get("cVenCode"));
                 if(StringUtils.isNotBlank(cVenCode)){
-
+                    map.put("cWhCode","PT0002");
                 }else{
                     throw new RuntimeException("供应商编码不能为空");
                 }
@@ -123,6 +125,34 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
         }
     }
 
+    //保存调拨单
+    public void saveTransVouch(Map<String,Object> rdRecord01Map){
+        Map<String,Object> transVouchMao=new HashMap<>();
+        //获取主表最大ID
+        transVouchMao.put("ID",getMaxId("ID","TransVouch"));
+        //获取最大编码
+        transVouchMao.put("cTVCode",getMaxId("cTVCode","TransVouch"));
+        //单据日期
+        Date date=new Date();
+        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        transVouchMao.put("cTVCode",formatter.format(date));
+        //转出部门
+        transVouchMao.put("cODepCode","");
+        //转入部门
+        transVouchMao.put("cIDepCode",rdRecord01Map.get("cDepCode"));
+        //转出仓库
+        transVouchMao.put("cOWhCode",rdRecord01Map.get("cWhCode"));
+        //转入仓库??
+        //通过接收方查询原材料仓库
+        String cVenCodeReceiver=rdRecord01Map.get("cVenCodeReceiver").toString();
+        transVouchMao.put("cIWhCode","");
+        //订单号
+        transVouchMao.put("cMPoCode",rdRecord01Map.get("cOrderCode"));
+        transVouchMao.put("cDefine13",rdRecord01Map.get("cOrderCode"));
+        //业务员
+        transVouchMao.put("cPersonCode",rdRecord01Map.get("cPersonCode"));
+    }
+
     @Override
     public Integer getMaxId(String id, String tableName) {
         Integer maxId=purchaseWarehousingMapper.getMaxId(id,tableName);

+ 18 - 8
jeecg-boot-module-system/src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8090
+  port: 8001
   tomcat:
     max-swallow-size: -1
   error:
@@ -118,7 +118,7 @@ spring:
         timeBetweenEvictionRunsMillis: 60000
         # 配置一个连接在池中最小生存的时间,单位是毫秒
         minEvictableIdleTimeMillis: 300000
-        validationQuery: SELECT 1 FROM DUAL
+#        validationQuery: SELECT 1 FROM DUAL
         testWhileIdle: true
         testOnBorrow: false
         testOnReturn: false
@@ -133,14 +133,24 @@ spring:
         master:
           url: jdbc:mysql://127.0.0.1:3306/sen_yu_dz_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
-          password: CuiDian1234
+          password: root
           driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
-          #multi-datasource1:
-          #url: jdbc:mysql://localhost:3306/jeecg-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-          #username: root
-          #password: root
-          #driver-class-name: com.mysql.cj.jdbc.Driver
+        multi-one:
+          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_101_2021
+          username: sa
+          password: Windows2008R2
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        multi-two:
+          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_102_2021
+          username: sa
+          password: Windows2008R2
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+        multi-three:
+          url: jdbc:sqlserver://192.168.1.18;DatabaseName=UFDATA_103_2021
+          username: sa
+          password: Windows2008R2
+          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
   #redis 配置
   redis:
     database: 0