多个bug修改

api-admin/src/main/java/com/glxp/sale/admin/controller/basic/BussinessOriginTypeController.java

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -94,6 +95,7 @@ public class BussinessOriginTypeController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         if (bussinessTypeEntity != null) {
+            bussinessTypeEntity.setUpdateTime(new Date());
             bussinessOriginTypeService.updateBusOriginType(bussinessTypeEntity);
         } else {
             ResultVOUtils.error(999, "参数错误");
@@ -113,6 +115,7 @@ public class BussinessOriginTypeController {
             if (bussinessOriginTypeEntity != null) {
                 return ResultVOUtils.error(500, "单据类型已存在！");
             }
+            bussinessTypeEntity.setUpdateTime(new Date());
             bussinessOriginTypeService.insertBusOriginType(bussinessTypeEntity);
         } else {
             return ResultVOUtils.error(999, "参数错误");

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java

@@ -638,7 +638,7 @@ public class WareHouseController {
 
         //批次号校验
         if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
-            return ResultVOUtils.error(500, "批次号不能为空！");
+            return ResultVOUtils.error(500, "序列号与批次号不能同时为空！");
         }
         String orderId = addOrderRequest.getOrderId();
 

api-admin/src/main/resources/application-dev.properties

@@ -28,8 +28,8 @@ spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
 spring.main.allow-bean-definition-overriding=true
 spring.redis.database=4 
-spring.redis.host=192.168.0.66
+spring.redis.host=127.0.0.1
-spring.redis.port=6400 
+spring.redis.port=6379 
 spring.redis.password=
 spring.redis.jedis.pool.max-active=8 
 spring.redis.jedis.pool.max-wait=-1

api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml

@@ -84,14 +84,14 @@
             parameterType="com.glxp.sale.admin.entity.basic.BussinessOriginTypeEntity">
         replace
         INTO basic_bustype_origin
-            (`action`, `name`, enable, remark, thirdSys, thirdSysName)
+            (`action`, `name`, enable, remark, thirdSys, thirdSysName,updateTime)
         values (
         #{action},
         #{name},
         #{enable},
         #{remark},
         #{thirdSys},
-        #{thirdSysName}
+        #{thirdSysName},#{updateTime}
         )
 
     </insert>
@@ -105,6 +105,8 @@
             <if test="thirdSys != null">thirdSys = #{thirdSys},</if>
             <if test="thirdSysName != null">thirdSysName = #{thirdSysName},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="updateTime != null">updateTime = #{updateTime},</if>
+
         </trim>
         WHERE id = #{id}
     </update>

api-admin/src/main/resources/mybatis/mapper/inventory/InvPreProductDao.xml

@@ -124,7 +124,7 @@
         ,inv_pre_product.reCount,inv_pre_product.customerId,
         basic_corp.name companyName,inv_pre_product.supId,inv_pre_product.unitFk ,inv_warehouse.name
         invStorageName,inv_pre_product.invStorageCode,inv_pre_product.price, inv_warehouse_sub.name invSubStorageName
-        ,inv_product.invWarehouseCode
+        ,inv_pre_product.invWarehouseCode
         FROM inv_pre_product
         inner join basic_udirel on inv_pre_product.relIdFk = basic_udirel.id
         inner join basic_products on basic_udirel.uuid = basic_products.uuid