Merge branch 'develop4' of http://172.16.29.40:8010/wms/wms4 into develop4

李泰瑜
2 parents bc505004 b121da7a
Showing 14 changed files with 237 additions and 49 deletions
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
huaheng-wms-core/src/main/java/org/jeecg/JeecgSystemApplication.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/erp/service/impl/ErpServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/mobile/controller/ReceiptController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/api/wcs/controller/WcsController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/framework/config/HuahengBatisInterceptor.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/IReceiptHeaderService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/service/impl/ReceiptHeaderServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/entity/ReceiptHeaderHistory.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/IReceiptHeaderHistoryService.java
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/receipt/receiptHeaderHistory/service/impl/ReceiptHeaderHistoryServiceImpl.java
huaheng-wms-core/src/main/java/org/jeecg/utils/HuahengJwtUtil.java
huaheng-wms-core/src/main/java/org/jeecg/utils/constant/QuantityConstant.java
@@ -154,6 +154,10 @@
           </a-tag>
         </span>
  
+        <span slot="reason" slot-scope="reason">
+          <span v-html="solutionReason(reason)"></span>
+        </span>
+
  
         <template slot='htmlSlot' slot-scope='text'>
           <div v-html='text'></div>
@@ -292,6 +296,12 @@ export default {
           dataIndex: 'remark'
         },
         {
+          title: '原因',
+          align: 'center',
+          dataIndex: 'reason',
+          scopedSlots: {customRender: 'reason'}
+        },
+        {
           title: '创建人',
           align: 'center',
           dataIndex: 'createBy'
@@ -465,6 +475,15 @@ export default {
         }
       })
       return actions.join('')
+    },
+    solutionReason(value){
+        if (value == 'WMS删除') {
+          return '<span style="color:black">WMS删除</span>'
+        } else if (value == '上游删除') {
+          return '<span style="color:#0e36b9">上游删除</span>'
+        } else if (value == '回传删除') {
+          return '<span style="color:green">回传删除</span>'
+        }
     }
   }
 }
 package org.jeecg;
  
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.net.UnknownHostException;
+import java.net.*;
 import java.util.Enumeration;
  
 import javax.transaction.SystemException;
  
 import org.jeecg.common.util.oConvertUtils;
 import org.springframework.boot.SpringApplication;
-//import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration;
@@ -20,10 +14,12 @@ import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.ComponentScan.Filter;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.core.env.Environment;
  
 import lombok.extern.slf4j.Slf4j;
-import net.bytebuddy.asm.Advice.This;
  
 /**
  * 单体启动类（采用此类启动为单体模式）
@@ -32,6 +28,7 @@ import net.bytebuddy.asm.Advice.This;
 @EnableCaching
 @SpringBootApplication
 @EnableAutoConfiguration(exclude = {MongoAutoConfiguration.class})
+@ComponentScan(excludeFilters = {@Filter(type = FilterType.REGEX, pattern = {"org.jeecg.config.mybatis.MybatisInterceptor"})})
 public class JeecgSystemApplication extends SpringBootServletInitializer {
  
     @Override
@@ -46,17 +43,13 @@ public class JeecgSystemApplication extends SpringBootServletInitializer {
         String port = env.getProperty("server.port");
         String profiles = env.getProperty("spring.profiles.active");
         String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path"));
-        log.info("\n----------------------------------------------------------\n\t"
-            + "Application HUAHENG WMS4 is running! Access urls:\n\n\t"
-            + "WEB Local: \thttp://localhost:" + port + path + "/index.html\n\t"
-            + "API Local: \thttp://localhost:" + port + path + "/\n\n\t"
-            + "WEB External: \thttp://" + ip + ":" + port + path + "/index.html\n\t"
-            + "API External: \thttp://" + ip + ":" + port + path + "/\n\n\t"
-            + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n\n\t"
-            + "The following profiles are active: [" + profiles + "]\n"
+        log.info("\n----------------------------------------------------------\n\t" + "Application HUAHENG WMS4 is running! Access urls:\n\n\t"
+            + "WEB Local: \thttp://localhost:" + port + path + "/index.html\n\t" + "API Local: \thttp://localhost:" + port + path + "/\n\n\t"
+            + "WEB External: \thttp://" + ip + ":" + port + path + "/index.html\n\t" + "API External: \thttp://" + ip + ":" + port + path + "/\n\n\t"
+            + "Swagger文档: \thttp://" + ip + ":" + port + path + "/doc.html\n\n\t" + "The following profiles are active: [" + profiles + "]\n"
             + "----------------------------------------------------------");
     }
-    
+
     public static InetAddress getLocalHostExactAddress() {
         try {
             InetAddress inetAddress = null;
@@ -34,6 +34,7 @@ import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptDetail;
 import org.jeecg.modules.wms.receipt.receiptHeader.entity.ReceiptHeader;
 import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptDetailService;
 import org.jeecg.modules.wms.receipt.receiptHeader.service.IReceiptHeaderService;
+import org.jeecg.modules.wms.receipt.receiptHeaderHistory.service.IReceiptHeaderHistoryService;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentDetail;
 import org.jeecg.modules.wms.shipment.shipmentHeader.entity.ShipmentHeader;
 import org.jeecg.modules.wms.shipment.shipmentHeader.service.IShipmentDetailService;
@@ -62,6 +63,8 @@ public class ErpServiceImpl implements IErpService {
     @Resource
     private IReceiptHeaderService receiptHeaderService;
     @Resource
+    private IReceiptHeaderHistoryService receiptHeaderHistoryService;
+    @Resource
     private IShipmentHeaderService shipmentHeaderService;
     @Resource
     private IMaterialService materialService;
@@ -203,7 +206,7 @@ public class ErpServiceImpl implements IErpService {
         if (receiptHeader == null) {
             return Result.error("入库单取消， 没有找到入库单");
         }
-        boolean success = receiptHeaderService.delMain(String.valueOf(receiptHeader.getId()));
+        boolean success = receiptHeaderService.delMain(String.valueOf(receiptHeader.getId()),QuantityConstant.UPSTREAM_DELETE_RECEIPT);
         if (!success) {
             return Result.error("入库单取消失败");
         }
@@ -441,6 +444,7 @@ public class ErpServiceImpl implements IErpService {
         if (!success) {
             throw new ServiceException("回传入库单失败, 更新入库单头失败");
         }
+        receiptHeaderService.delMain(receiptHeader.getId().toString(),QuantityConstant.BACK_DELETE_RECEIPT);
         return Result.ok("回传入库单成功");
     }
  
@@ -51,22 +51,4 @@ public class ReceiptController extends HuahengBaseController {
         });
         return result;
     }
-
-    @AutoLog(value = "PDA入库-快速入库")
-    @ApiOperation(value = "PDA入库-快速入库", notes = "快速入库")
-    @PostMapping("/quickReceipt")
-    @ResponseBody
-    @ApiLogger(apiName = "PDA入库-快速入库", from = "PDA")
-    public Result<?> quickReceipt(@RequestBody QuickReceiptBean bean, HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
-        bean.setWarehouseCode(warehouseCode);
-
-        Result<?> result = handleMultiProcess("quickReceipt", new MultiProcessListener() {
-            @Override
-            public Result<?> doProcess() {
-                return mobileService.quickReceipt(bean, warehouseCode);
-            }
-        });
-        return result;
-    }
 }
@@ -41,7 +41,7 @@ public class WcsController extends HuahengBaseController {
     @ResponseBody
     @ApiLogger(apiName = "仓位分配", from = "WCS")
     public Result warecellAllocation(@RequestBody WarecellDomain warecellDomain, HttpServletRequest req) {
-        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+        String warehouseCode = warecellDomain.getWarehouseCode();
         if (StringUtils.isEmpty(warehouseCode)) {
             return Result.error("仓位分配， 仓库号为空");
         }
+package org.jeecg.modules.wms.framework.config;
+
+import java.lang.reflect.Field;
+import java.util.Date;
+import java.util.Properties;
+
+import org.apache.ibatis.binding.MapperMethod;
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.SqlCommandType;
+import org.apache.ibatis.plugin.*;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
+import org.springframework.stereotype.Component;
+
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+@Component
+@Intercepts({@Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})})
+public class HuahengBatisInterceptor implements Interceptor {
+
+    @Override
+    public Object intercept(Invocation invocation) throws Throwable {
+        MappedStatement mappedStatement = (MappedStatement)invocation.getArgs()[0];
+        String sqlId = mappedStatement.getId();
+        log.debug("------sqlId------" + sqlId);
+        SqlCommandType sqlCommandType = mappedStatement.getSqlCommandType();
+        Object parameter = invocation.getArgs()[1];
+        log.debug("------sqlCommandType------" + sqlCommandType);
+
+        if (parameter == null) {
+            return invocation.proceed();
+        }
+        if (SqlCommandType.INSERT == sqlCommandType) {
+            LoginUser sysUser = this.getLoginUser();
+            Field[] fields = oConvertUtils.getAllFields(parameter);
+            for (Field field : fields) {
+                log.debug("------field.name------" + field.getName());
+                try {
+                    if ("createBy".equals(field.getName())) {
+                        field.setAccessible(true);
+                        Object local_createBy = field.get(parameter);
+                        field.setAccessible(false);
+                        if (local_createBy == null || local_createBy.equals("")) {
+                            if (sysUser != null) {
+                                // 登录人账号
+                                field.setAccessible(true);
+                                field.set(parameter, sysUser.getRealname());
+                                field.setAccessible(false);
+                            }
+                        }
+                    }
+                    // 注入创建时间
+                    if ("createTime".equals(field.getName())) {
+                        field.setAccessible(true);
+                        Object local_createDate = field.get(parameter);
+                        field.setAccessible(false);
+                        if (local_createDate == null || local_createDate.equals("")) {
+                            field.setAccessible(true);
+                            field.set(parameter, new Date());
+                            field.setAccessible(false);
+                        }
+                    }
+                    // 注入部门编码
+                    if ("sysOrgCode".equals(field.getName())) {
+                        field.setAccessible(true);
+                        Object local_sysOrgCode = field.get(parameter);
+                        field.setAccessible(false);
+                        if (local_sysOrgCode == null || local_sysOrgCode.equals("")) {
+                            // 获取登录用户信息
+                            if (sysUser != null) {
+                                field.setAccessible(true);
+                                field.set(parameter, sysUser.getOrgCode());
+                                field.setAccessible(false);
+                            }
+                        }
+                    }
+                } catch (Exception e) {
+                }
+            }
+        }
+        if (SqlCommandType.UPDATE == sqlCommandType) {
+            LoginUser sysUser = this.getLoginUser();
+            Field[] fields = null;
+            if (parameter instanceof MapperMethod.ParamMap) {
+                MapperMethod.ParamMap<?> p = (MapperMethod.ParamMap<?>)parameter;
+                // update-begin-author:scott date:20190729 for:批量更新报错issues/IZA3Q--
+                if (p.containsKey("et")) {
+                    parameter = p.get("et");
+                } else {
+                    parameter = p.get("param1");
+                }
+                // update-end-author:scott date:20190729 for:批量更新报错issues/IZA3Q-
+
+                // update-begin-author:scott date:20190729 for:更新指定字段时报错 issues/#516-
+                if (parameter == null) {
+                    return invocation.proceed();
+                }
+                // update-end-author:scott date:20190729 for:更新指定字段时报错 issues/#516-
+
+                fields = oConvertUtils.getAllFields(parameter);
+            } else {
+                fields = oConvertUtils.getAllFields(parameter);
+            }
+
+            for (Field field : fields) {
+                log.debug("------field.name------" + field.getName());
+                try {
+                    if ("updateBy".equals(field.getName())) {
+                        // 获取登录用户信息
+                        if (sysUser != null) {
+                            // 登录账号
+                            field.setAccessible(true);
+                            field.set(parameter, sysUser.getRealname());
+                            field.setAccessible(false);
+                        }
+                    }
+                    if ("updateTime".equals(field.getName())) {
+                        field.setAccessible(true);
+                        field.set(parameter, new Date());
+                        field.setAccessible(false);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return invocation.proceed();
+    }
+
+    @Override
+    public Object plugin(Object target) {
+        return Plugin.wrap(target, this);
+    }
+
+    @Override
+    public void setProperties(Properties properties) {
+        // TODO Auto-generated method stub
+    }
+
+    // update-begin--Author:scott Date:20191213 for：关于使用Quzrtz 开启线程任务， #465
+    private LoginUser getLoginUser() {
+        LoginUser sysUser = null;
+        try {
+            sysUser = SecurityUtils.getSubject().getPrincipal() != null ? (LoginUser)SecurityUtils.getSubject().getPrincipal() : null;
+        } catch (Exception e) {
+            sysUser = null;
+        }
+        return sysUser;
+    }
+
+}
@@ -9,6 +9,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.wms.api.mobile.entity.QuickReceiptBean;
+import org.jeecg.modules.wms.api.mobile.service.IMobileService;
+import org.jeecg.modules.wms.framework.aspectj.lang.annotation.ApiLogger;
+import org.jeecg.modules.wms.framework.controller.HuahengBaseController;
 import org.jeecg.utils.HuahengJwtUtil;
 import org.jeecg.modules.wms.api.erp.service.IErpService;
 import org.jeecg.modules.wms.config.material.entity.Material;
@@ -64,6 +68,9 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
     @Autowired
     private IReceiptHeaderService receiptHeaderService;
  
+    @Resource
+    private IMobileService mobileService;
+
     @Autowired
     private IReceiptDetailService receiptDetailService;
     @Resource
@@ -134,7 +141,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
     @RequiresPermissions("receiptHeader:delete")
     @DeleteMapping(value = "/delete")
     public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
-        receiptHeaderService.delMain(id);
+        receiptHeaderService.delMain(id,QuantityConstant.WMS_DELETE_RECEIPT);
         return Result.OK("删除成功!");
     }
  
@@ -345,4 +352,17 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
         Result result = erpService.backReceipt(receiptHeader);
         return result;
     }
+
+    @AutoLog(value = "PDA入库-快速入库")
+    @ApiOperation(value = "PDA入库-快速入库", notes = "快速入库")
+    @PostMapping("/quickReceipt")
+    @ResponseBody
+    @ApiLogger(apiName = "PDA入库-快速入库", from = "PDA")
+    public Result<?> quickReceipt(@RequestBody QuickReceiptBean bean, HttpServletRequest req) {
+        String warehouseCode = HuahengJwtUtil.getWarehouseCodeByToken(req);
+        bean.setWarehouseCode(warehouseCode);
+
+        return mobileService.quickReceipt(bean, warehouseCode);
+
+    }
 }
@@ -17,9 +17,9 @@ import java.util.List;
 public interface IReceiptHeaderService extends IService<ReceiptHeader> {
  
     /**
-     * 删除一对多
+     * 删除一对多 reason进入历史单据的原因
      */
-    public boolean delMain(String id);
+    public boolean delMain(String id,String reason);
  
     /**
      * 批量删除一对多
@@ -52,15 +52,21 @@ public class ReceiptHeaderServiceImpl extends ServiceImpl&lt;ReceiptHeaderMapper, R
     @Resource
     private IReceiptHeaderHistoryService receiptHeaderHistoryService;
  
+    /**
+     * @param id 入库单主表id
+     * @param reason 进入历史单据的原因
+     * @return
+     */
     @Override
     @Transactional
-    public boolean delMain(String id) {
+    public boolean delMain(String id,String reason) {
         ReceiptHeader receiptHeader = getById(id);
         if (receiptHeader.getFirstStatus().intValue() > QuantityConstant.RECEIPT_HEADER_BUILD) {
             throw new ServiceException("不能删除非新建状态单据");
         }
-        receiptHeaderHistoryService.saveById(id);
+        receiptHeaderHistoryService.saveById(id,reason);
         boolean success = receiptDetailMapper.deleteByMainId(id);
+
         if (!success) {
             return success;
         }
@@ -76,6 +76,10 @@ public class ReceiptHeaderHistory implements Serializable {
     @Excel(name = "入库单备注", width = 15)
     @ApiModelProperty(value = "入库单备注")
     private String remark;
+    /** 来源信息  */
+    @Excel(name = "来源信息", width = 15)
+    @ApiModelProperty(value = "来源信息")
+    private String reason;
     /** 备用字段1 */
     @Excel(name = "备用字段1", width = 15)
     @ApiModelProperty(value = "备用字段1")
@@ -29,6 +29,7 @@ public interface IReceiptHeaderHistoryService extends IService&lt;ReceiptHeaderHist
     /**
      * 根据删除的入库单主表ID新增历史入库单记录
      * @param id
+     * @param reason 进入历史单据的原因
      */
-    void saveById(String id);
+    void saveById(String id,String reason);
 }
@@ -68,9 +68,10 @@ public class ReceiptHeaderHistoryServiceImpl extends ServiceImpl&lt;ReceiptHeaderHi
     /**
      * 根据删除的入库单主表ID新增历史入库单记录
      * @param id
+     * @param reason 进入历史单据的原因
      */
     @Override
-    public void saveById(String id) {
+    public void saveById(String id,String reason) {
         ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
         ReceiptHeaderHistory receiptHeaderHistory = new ReceiptHeaderHistory();
         receiptHeaderHistory.setCode(receiptHeader.getCode());
@@ -84,6 +85,7 @@ public class ReceiptHeaderHistoryServiceImpl extends ServiceImpl&lt;ReceiptHeaderHi
         receiptHeaderHistory.setTotalqty(receiptHeader.getTotalqty());
         receiptHeaderHistory.setTotallines(receiptHeader.getTotallines());
         receiptHeaderHistory.setRemark(receiptHeader.getRemark());
+        receiptHeaderHistory.setReason(reason);
         receiptHeaderHistory.setUserdef1(receiptHeader.getUserdef1());
         receiptHeaderHistory.setUserdef2(receiptHeader.getUserdef2());
         receiptHeaderHistory.setUserdef3(receiptHeader.getUserdef3());
@@ -10,8 +10,6 @@ import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.wms.framework.aspectj.dto.ApiAuthentication;
 import org.jeecg.modules.wms.framework.aspectj.dto.RSA256Key;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.env.Environment;
  
 import com.auth0.jwt.JWT;
 import com.auth0.jwt.JWTVerifier;
@@ -21,7 +19,6 @@ import com.auth0.jwt.interfaces.DecodedJWT;
  
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
-import net.bytebuddy.asm.Advice.This;
  
 public class HuahengJwtUtil {
  
@@ -158,8 +155,8 @@ public class HuahengJwtUtil {
     public static void main(String[] args) throws Exception {
         ApiAuthentication apiAuthentication = new ApiAuthentication();
         // 生成TOKEN必填参数
-        apiAuthentication.setOperator("TanYibin"); // Token提供方
-        apiAuthentication.setAudience("ACS001"); // Token使用方
+        apiAuthentication.setOperator("youjie"); // Token提供方
+        apiAuthentication.setAudience("pda"); // Token使用方
         apiAuthentication.setExpireDateTime(DateUtil.parse("2099-12-31 23:59:59", DatePattern.NORM_DATETIME_PATTERN)); // Token失效时间
  
         String tokenString = sign(apiAuthentication);
@@ -707,4 +707,10 @@ public class QuantityConstant {
     public static final String ERP_PASSWORD = "123123";
     public static final String ERP_LCID = "2052";
     public static final String ERP_ServerUrl = "http://erptest.gani.com.cn/K3Cloud/";
+
+    public static final String UPSTREAM_DELETE_RECEIPT="上游删除";
+    public static final String BACK_DELETE_RECEIPT="回传删除";
+    public static final String WMS_DELETE_RECEIPT="WMS删除";
+
+
 }