货位，bug修改，单据同步修改

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -408,4 +408,8 @@ public class BasicBussinessTypeEntity {
     private boolean advancePreIn;
     @TableField(value = "sortNum")
     private Integer sortNum;
+
+    //是否按货位出库    0：不按货位出库，1:按货位出库
+    @TableField(value = "spaceOut")
+    private int spaceOut;
 }

src/main/java/com/glxp/api/entity/sync/SyncDataBustypeEntity.java

@@ -24,4 +24,9 @@ public class SyncDataBustypeEntity {
     private Integer orderStatus;        //单据状态
     @TableField(value = "`direct`")
     private int direct;         //1:UDI管理系统->SPMS  2:SPMS->UDI管理系统
+
+    @TableField(value = "`syncStatus`")
+    private Integer syncStatus;       //同步后单据状态
+    @TableField(value = "`syncChange`")
+    private Integer syncChange;       //同步后是否自动补单
 }

src/main/java/com/glxp/api/idc/controller/IdcController.java

@@ -53,18 +53,18 @@ public class IdcController {
                                @RequestParam("content") String content,
                                @RequestParam(value = "files", required = false) MultipartFile[] files) {
         //
-        return idcService.receive( request, content, files);
+        return idcService.receive(request, content, files);
     }
 
     @RequestMapping(value = "/spssync/common/once")
     @ResponseBody
-    public BaseResponse once(HttpServletRequest request,@RequestBody Map<String, Object> params) {
+    public BaseResponse once(HttpServletRequest request, @RequestBody Map<String, Object> params) {
         //
-    	boolean isUpload = params.get("isUpload")!=null && params.get("isUpload").equals("1") ? true : false ;
-        return idcService.onceSync( params.get("tableName").toString(), isUpload);
+        boolean isUpload = params.get("isUpload") != null && params.get("isUpload").equals("1") ? true : false;
+        return idcService.onceSync(params.get("tableName").toString(), isUpload);
     }
-  
-   
+
+
     //@Log("数据同步测试")
     @RequestMapping(value = "/spssync/common/test")
     public BaseResponse test(HttpServletRequest request, @RequestBody Map<String, Object> params) {
@@ -85,17 +85,19 @@ public class IdcController {
     public BaseResponse download(HttpServletRequest request, @RequestBody Map<String, Object> params) {
         return idcService.download(request, params);
     }
+
     @RequestMapping(value = "/spssync/common/uploadStatus")
     @ResponseBody
     public BaseResponse uploadStatus(HttpServletRequest request, @RequestBody Map<String, Object> params) {
         return idcService.uploadStatus(request, params);
     }
-    
+
     @RequestMapping(value = "/spssync/common/downloadStatus")
     @ResponseBody
     public BaseResponse downloadStatus(HttpServletRequest request, @RequestBody Map<String, Object> params) {
         return idcService.downloadStatus(request, params);
     }
+
     //@Log("数据同步任务根据任务ID,返回下载成功标记")
     @RequestMapping(value = "/spssync/common/success")
     @ResponseBody
@@ -104,15 +106,15 @@ public class IdcController {
     }
 
     @RequestMapping(value = "/spssync/common/downloadFile")
-    public void downloadFile(HttpServletResponse response,@RequestParam String fileName) throws UnsupportedEncodingException {
-    	if (fileName != null) {
-    	   response.setHeader("Content-disposition", "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8"));
-    	   response.setContentType("application/force-download");
-    	   idcService.downloadFile(fileName, response);
-    	}
-    	
+    public void downloadFile(HttpServletResponse response, @RequestParam String fileName) throws UnsupportedEncodingException {
+        if (fileName != null) {
+            response.setHeader("Content-disposition", "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8"));
+            response.setContentType("application/force-download");
+            idcService.downloadFile(fileName, response);
+        }
+
     }
-    
+
     @RequestMapping("/mapi/**")
     public Object mapi(HttpServletRequest request, HttpServletResponse httpServletResponse) {
         String uri = parseUri(request.getRequestURL().toString());

src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java

@@ -152,4 +152,7 @@ public class BasicBussinessTypeResponse {
     private String checkPreInOrders;
     private Boolean advancePreIn;
     private Integer sortNum;
+
+
+    private int spaceOut;
 }

src/main/java/com/glxp/api/service/auth/impl/InvSpaceServiceImpl.java

@@ -59,7 +59,7 @@ public class InvSpaceServiceImpl implements InvSpaceService {
         //获取当前仓库下的最大货位编码
         String maxSpaceCode = invSpaceDao.getMaxSpaceCode(null);
         if (StrUtil.isBlank(maxSpaceCode)) {
-            maxSpaceCode = "0000";
+            maxSpaceCode = "1000";
         }
         String spaceCode = getSpaceCode(maxSpaceCode);
         invSpace.setCode(spaceCode);

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -721,7 +721,9 @@ public class IoOrderServiceImpl implements IoOrderService {
             //查询往来单位名称
             if (StrUtil.isNotBlank(order.getFromCorp())) {
                 BasicCorpEntity corpEntity = basicCorpDao.selectByErpId(order.getFromCorp());
-                response.setFromCorpName(corpEntity.getName());
+                if (corpEntity != null)
+                    response.setFromCorpName(corpEntity.getName());
+
             } else if (StrUtil.isNotBlank(order.getFromInvCode())) {
                 String fromInvName = invWarehouseDao.selectNameByCode(order.getFromInvCode());
                 response.setFromCorpName(fromInvName);

src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml

@@ -73,7 +73,7 @@
                                    thrCheckPdaUn, thrCheckPdaEd, thrCheckUdims, thrCheckPc, thrCheckSp,
                                    thrCheckChange, thrCheckBalance, thrCheckCopy, fillCodeRel, checkVailDate,
                                    checkExpire, checkCertExpire, preInBackAction, backPreinType, checkPreInOrders,
-                                   sortNum)
+                                   sortNum,spaceOut)
         values (#{mainAction}, #{action}, #{name}, #{enable}, #{remark}, #{thirdSysFk}, #{genUnit}, #{innerOrder},
                 #{secCheckEnable}, #{checkEnable}, #{checkUdims}, #{checkPdaEd}, #{checkPdaUn}, #{checkPc},
                 #{checkWebNew}, #{checkSp}, #{checkChange}, #{secCheckUdims}, #{secCheckPdaEd}, #{secCheckPdaUn},
@@ -86,7 +86,7 @@
                 #{thrCheckPdaUn}, #{thrCheckPdaEd}, #{thrCheckUdims}, #{thrCheckPc}, #{thrCheckSp},
                 #{thrCheckChange}, #{thrCheckBalance}, #{thrCheckCopy}, #{fillCodeRel}, #{checkVailDate},
                 #{checkExpire}, #{checkCertExpire}, #{preInBackAction}, #{backPreinType}, #{checkPreInOrders},
-                #{sortNum})
+                #{sortNum},#{spaceOut})
     </insert>
 
     <select id="selectBusList" resultType="com.glxp.api.entity.basic.BasicBussinessTypeEntity">

src/main/resources/mybatis/mapper/system/SyncDataBustypeDao.xml

@@ -11,13 +11,13 @@
 
     <insert id="inserts" parameterType="com.glxp.api.entity.sync.SyncDataBustypeEntity">
         replace INTO sync_data_bustypes
-                (id, `action`, `name`, outChange, orderStatus, direct)
+                (id, `action`, `name`, outChange, orderStatus, direct, syncStatus, syncChange)
                 values
 
         <foreach collection="syncDataBustypeEntities" item="item" index="index"
                  separator=",">
             (#{item.id}, #{item.action}, #{item.name},
-             #{item.outChange}, #{item.orderStatus}, #{item.direct})
+             #{item.outChange}, #{item.orderStatus}, #{item.direct}, #{item.syncStatus}, #{item.syncChange})
         </foreach>
     </insert>
 </mapper>

src/main/resources/schemas/schema_v2.1.sql

@@ -364,7 +364,11 @@ CALL Pro_Temp_ColumnWork('sync_data_set', 'orderInvoice', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('io_order_invoice', 'id', 'bigint ', 2);
 
 CALL Pro_Temp_ColumnWork('io_order_detail_code', 'regStatus', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('io_order', 'reviewSp', 'tinyint', 1);
 
+CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncStatus', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncChange', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'spaceOut', 'tinyint', 1);