Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/ivt/InboundItemMapper.xml

@@ -9,7 +9,7 @@
         into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty, return_amt,
         remarks, inv_id, cost_price, cost_amt, out_qty, inv_qty, flg_valid, cp_id, op_create_time,
         op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,
-        s_into_id,s_into_item_id,s_pur_id,s_pur_item_id
+        s_into_id,s_into_item_id,s_pur_id,s_pur_item_id,intoing_box,intoing_piece,into_box,into_piece
     </sql>
 
     <!-- response通用查询列 -->
@@ -17,7 +17,8 @@
         tpii.item_id, tpii.into_id, tpii.into_type, tpii.from_id, tpii.from_item_id, tpii.item_index, tpii.sku_id, tpii.price_into,
         tpii.non_std_code, tpii.into_status, tpii.intoing_qty, tpii.intoing_amt, tpii.into_qty, tpii.into_amt, tpii.return_qty,
         tpii.return_amt, tpii.remarks, tpii.inv_id, tpii.cost_price, tpii.cost_amt, tpii.out_qty, tpii.inv_qty, tpii.flg_valid,
-        tpii.cp_id,tpii.s_into_id,tpii.s_into_item_id,tpii.s_pur_id,tpii.s_pur_item_id
+        tpii.cp_id,tpii.s_into_id,tpii.s_into_item_id,tpii.s_pur_id,tpii.s_pur_item_id,
+        tppi.intoing_box,tppi.intoing_piece,tppi.into_box,tppi.into_piece
     </sql>
 
 
@@ -58,6 +59,10 @@
         <result column="s_into_item_id" property="sIntoItemId" typeHandler="UuidTypeHandler"/>
         <result column="s_pur_id" property="sPurId" typeHandler="UuidTypeHandler"/>
         <result column="s_pur_item_id" property="sPurItemId" typeHandler="UuidTypeHandler"/>
+        <result column="intoing_box" property="intoingBox" />
+        <result column="intoing_piece" property="intoingPiece" />
+        <result column="into_box" property="intoBox" />
+        <result column="into_piece" property="intoPiece" />
     </resultMap>
 
 
@@ -94,6 +99,10 @@
         <result column="s_into_item_id" property="sIntoItemId" typeHandler="UuidTypeHandler"/>
         <result column="s_pur_id" property="sPurId" typeHandler="UuidTypeHandler"/>
         <result column="s_pur_item_id" property="sPurItemId" typeHandler="UuidTypeHandler"/>
+        <result column="intoing_box" property="intoingBox" />
+        <result column="intoing_piece" property="intoingPiece" />
+        <result column="into_box" property="intoBox" />
+        <result column="into_piece" property="intoPiece" />
     </resultMap>
 <!--    退货用-->
     <resultMap id="BaseResultMapReturnResponse" type="com.dk.mdm.model.response.ivt.InboundItemResponse">
@@ -142,6 +151,10 @@
         <result column="sPurItemReturnAmt" property="sPurItemReturnAmt"/>
         <result column="usableQty" property="usableQty"/>
         <result column="nonStdCode" property="nonStdCode"/>
+        <result column="intoing_box" property="intoingBox" />
+        <result column="intoing_piece" property="intoingPiece" />
+        <result column="into_box" property="intoBox" />
+        <result column="into_piece" property="intoPiece" />
 
     </resultMap>
 
@@ -368,7 +381,11 @@
         tpii.cost_price,
         tpii.cost_amt,
         tpii.wh_id,
-        tpii.inv_qty
+        tpii.inv_qty,
+        tpii.intoing_box,
+        tpii.intoing_piece,
+        tpii.into_box,
+        tpii.into_piece
     </sql>
     <sql id="Base_Column_List_Response_Out">
         tpoi.item_id,
@@ -392,7 +409,11 @@
         tpoi.cost_price,
         tpoi.cost_amt,
         null as  wh_id,
-        null  as inv_qty
+        null  as inv_qty,
+        tpoi.outing_box as intoing_box,
+        tpoi.outing_piece as intoing_piece,
+        tpoi.out_box as into_box,
+        tpoi.out_piece as into_piece
     </sql>
     <!--条件查询 web端入库办理用-->
     <select id="selectInboundItem" resultMap="BaseResultMapResponse">

src/main/java/com/dk/mdm/mapper/ivt/OutboundItemMapper.xml

@@ -10,7 +10,7 @@
         out_status, outing_qty, outing_amt, out_qty, out_amt, return_qty, return_amt, remarks,
         inv_id, cost_price, cost_amt, flg_valid, cp_id, op_create_time, op_create_user_id,
         op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,
-        s_out_id,s_out_item_id,s_order_id,s_order_item_id
+        s_out_id,s_out_item_id,s_order_id,s_order_item_id,outing_box,outing_piece,out_box,out_piece
     </sql>
 
     <sql id="Base_Column_List_Response">
@@ -21,8 +21,8 @@
         tpoi.sku_id, tpoi.price_out, tpoi.non_std_code, tpoi.out_status, tpoi.outing_qty, tpoi.outing_amt,
         tpoi.out_qty, tpoi.out_amt, tpoi.return_qty, tpoi.return_amt, tpoi.remarks, tpoi.inv_id,
         tpoi.cost_price, tpoi.cost_amt, tpoi.flg_valid, tpoi.cp_id,
-        tpoi.s_out_id,tpoi.s_out_item_id,tpoi.s_order_id,tpoi.s_order_item_id
-
+        tpoi.s_out_id,tpoi.s_out_item_id,tpoi.s_order_id,tpoi.s_order_item_id,
+        tpoi.outing_box,tpoi.outing_piece,tpoi.out_box,tpoi.out_piece
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -60,6 +60,10 @@
         <result column="s_out_item_id" property="sOutItemId" typeHandler="UuidTypeHandler"/>
         <result column="s_order_id" property="sOrderId" typeHandler="UuidTypeHandler"/>
         <result column="s_order_item_id" property="sOrderItemId" typeHandler="UuidTypeHandler"/>
+        <result column="outing_box" property="outingBox"/>
+        <result column="outing_piece" property="outingPiece"/>
+        <result column="out_box" property="outBox"/>
+        <result column="out_piece" property="outPiece"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -105,6 +109,10 @@
         <result column="invQty" property="invQty"/>
         <result column="usableQty" property="usableQty"/>
         <result column="whName" property="whName"/>
+        <result column="outing_box" property="outingBox"/>
+        <result column="outing_piece" property="outingPiece"/>
+        <result column="out_box" property="outBox"/>
+        <result column="out_piece" property="outPiece"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -514,7 +522,11 @@
         tpoi.remarks,
         tpoi.inv_id,
         tpoi.cost_price,
-        tpoi.cost_amt
+        tpoi.cost_amt,
+        tpoi.outing_box,
+        tpoi.outing_piece,
+        tpoi.out_box,
+        tpoi.out_piece
     </sql>
     <sql id="Base_Column_List_Response_Into">
         tpii.item_id ,
@@ -536,7 +548,11 @@
         tpii.remarks,
         tpii.inv_id,
         tpii.cost_price,
-        tpii.cost_amt
+        tpii.cost_amt,
+        tpii.intoing_box as outing_box,
+        tpii.intoing_piece as outing_piece,
+        tpii.into_box as out_box,
+        tpii.into_piece as out_piece
     </sql>
     <!--条件查询 web端出库办理用-->
     <select id="selectOutboundItem" resultMap="BaseResultMapResponse">

src/main/java/com/dk/mdm/mapper/mac/MacTransferMapper.xml

@@ -143,6 +143,7 @@
         tmo.org_name  ,
         tms.staff_name   ,
         makestaff.staff_name
+        order by t.make_time desc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>

src/main/java/com/dk/mdm/model/pojo/ivt/InboundItem.java

@@ -328,6 +328,23 @@ public class InboundItem extends PageInfo<InboundItem> implements Serializable {
     @ApiModelProperty(value = "入库仓库")
     private String whId;
 
+    @Excel(name = "箱（入库中）")
+    @ApiModelProperty(value = "箱（入库中）")
+    private  Integer intoingBox;
+
+    @Excel(name = "片（入库中）")
+    @ApiModelProperty(value = "片（入库中）")
+    private  Integer intoingPiece;
+
+    @Excel(name = "箱（已入库")
+    @ApiModelProperty(value = "箱（已入库）")
+    private  Integer intoBox;
+
+    @Excel(name = "片（已入库")
+    @ApiModelProperty(value = "片（已入库）")
+    private  Integer intoPiece;
+
+
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/pojo/ivt/OutboundItem.java

@@ -305,6 +305,21 @@ public class OutboundItem extends PageInfo<OutboundItem> implements Serializable
     @TableField(typeHandler = UuidTypeHandler.class)
     private String sOrderItemId;
 
+    @Excel(name = "箱（出库中）")
+    @ApiModelProperty(value = "箱（出库中）")
+    private  Integer outingBox;
+
+    @Excel(name = "片（出库中）")
+    @ApiModelProperty(value = "片（出库中）")
+    private  Integer outingPiece;
+
+    @Excel(name = "箱（已出库）")
+    @ApiModelProperty(value = "箱（已出库）")
+    private  Integer outBox;
+
+    @Excel(name = "片（已出库）")
+    @ApiModelProperty(value = "片（已出库）")
+    private  Integer outPiece;
 
 
     private static final long serialVersionUID = 1L;

src/main/java/com/dk/mdm/model/response/ivt/InboundItemResponse.java

@@ -262,6 +262,23 @@ public class InboundItemResponse  {
     @ApiModelProperty(value = "有效标识 (1：正常 0：停用)")
     private Boolean flgValid;
 
+    @Excel(name = "箱（入库中）")
+    @ApiModelProperty(value = "箱（入库中）")
+    private  Integer intoingBox;
+
+    @Excel(name = "片（入库中）")
+    @ApiModelProperty(value = "片（入库中）")
+    private  Integer intoingPiece;
+
+    @Excel(name = "箱（已入库")
+    @ApiModelProperty(value = "箱（已入库）")
+    private  Integer intoBox;
+
+    @Excel(name = "片（已入库")
+    @ApiModelProperty(value = "片（已入库）")
+    private  Integer intoPiece;
+
+
 
     /**
      * 企业ID

src/main/java/com/dk/mdm/model/response/ivt/OutboundItemResponse.java

@@ -204,6 +204,24 @@ public class OutboundItemResponse {
     private Boolean flgValid;
 
 
+    @Excel(name = "箱（出库中）")
+    @ApiModelProperty(value = "箱（出库中）")
+    private  Integer outingBox;
+
+    @Excel(name = "片（出库中）")
+    @ApiModelProperty(value = "片（出库中）")
+    private  Integer outingPiece;
+
+    @Excel(name = "箱（已出库）")
+    @ApiModelProperty(value = "箱（已出库）")
+    private  Integer outBox;
+
+    @Excel(name = "片（已出库）")
+    @ApiModelProperty(value = "片（已出库）")
+    private  Integer outPiece;
+
+
+
     /**
      * 企业ID
      */

src/main/java/com/dk/mdm/model/vo/ivt/InboundItemVO.java

@@ -218,6 +218,19 @@ public class InboundItemVO  {
     @TableField(typeHandler = UuidTypeHandler.class)
     private String sPurItemId;
 
+    @ApiModelProperty(value = "箱（入库中）")
+    private  Integer intoingBox;
+
+    @ApiModelProperty(value = "片（入库中）")
+    private  Integer intoingPiece;
+
+    @ApiModelProperty(value = "箱（已入库）")
+    private  Integer intoBox;
+
+    @ApiModelProperty(value = "片（已入库）")
+    private  Integer intoPiece;
+
+
 
     /*
      * 相关属性

src/main/java/com/dk/mdm/model/vo/ivt/OutboundItemVO.java

@@ -190,6 +190,20 @@ public class OutboundItemVO {
     private Boolean flgValid;
 
 
+    @ApiModelProperty(value = "箱（出库中）")
+    private  Integer outingBox;
+
+    @ApiModelProperty(value = "片（出库中）")
+    private  Integer outingPiece;
+
+    @ApiModelProperty(value = "箱（已出库）")
+    private  Integer outBox;
+
+    @ApiModelProperty(value = "片（已出库）")
+    private  Integer outPiece;
+
+
+
     /**
      * 企业ID
      */

src/main/java/com/dk/mdm/model/vo/mst/GoodsSkuVO.java

@@ -78,10 +78,10 @@ public class GoodsSkuVO implements Serializable {
 
 
     /**
-     * 入库金额
+     * 成本价格
      */
-    @ApiModelProperty(value = "入库金额")
-    private BigDecimal intoAmt;
+    @ApiModelProperty(value = "成本价格")
+    private BigDecimal priceInto;
 
     /**
      * 商品名称

src/main/java/com/dk/mdm/service/ivt/CheckService.java

@@ -123,11 +123,11 @@ public class CheckService extends BaseService<Check> {
 				CheckItem checkItem = checkItemConvert.convertToPo(checkItemVO);
 				// 获取盘点主表uuid
 				checkItem.setCheckId(check.getCheckId()).setCheckDate(LocalDate.now())
-						.setOInvQty(checkItemVO.getInvQty());
+						.setOInvQty(checkItemVO.getInvQty()).setRemarks(checkItemVO.getRemarks());
 				// 插入盘点单明细数据
 				checkItemMapper.insert(checkItem);
 				checkItemVO.setFromitemId(checkItem.getItemId()).setIntoingQty(checkItem.getBalanceQty()).setOutingQty(checkItem.getBalanceQty().abs())
-						.setFromId(checkItem.getCheckId()).setPriceOut(BigDecimal.ZERO);
+						.setFromId(checkItem.getCheckId()).setPriceOut(BigDecimal.ZERO).setRemarks(checkItem.getRemarks());
 			}
 		}
 		// 判断盘点点状态,如果是完成，需要生成出入库数据
@@ -231,12 +231,12 @@ public class CheckService extends BaseService<Check> {
 				CheckItem checkItem = checkItemConvert.convertToPo(checkItemVO);
 				// 获取盘点主表uuid
 				checkItem.setCheckId(check.getCheckId()).setCheckDate(LocalDate.now())
-						.setOInvQty(checkItemVO.getInvQty());
+						.setOInvQty(checkItemVO.getInvQty()).setRemarks(checkItemVO.getRemarks());
 				// 插入盘点单明细数据
 				checkItemMapper.insert(checkItem);
 				checkItemVO.setFromitemId(checkItem.getItemId()).setIntoingQty(checkItem.getBalanceQty())
 						.setOutingQty(checkItem.getBalanceQty().abs()).setFromId(checkItem.getCheckId())
-						.setPriceOut(BigDecimal.ZERO);
+						.setPriceOut(BigDecimal.ZERO).setRemarks(checkItem.getRemarks());
 			}
 			// 编辑
 			List<CheckItemVO> editCheckItemVOList = checkVO.getItemList().stream().filter(it -> it.getItemId() != null).collect(Collectors.toList());

src/main/java/com/dk/mdm/service/ivt/FreezeService.java

@@ -142,7 +142,7 @@ public class FreezeService extends BaseService<Freeze> {
 				// 赋值库存可售量、冻结量和库存ID值
 				inventoryUpdate.setInvId(freezeItemVO.getInvId()).setFreezeQty(freezeqty).setUsableQty(usableQt);
 				// 修改库存冻结量、可售量
-				inventoryService.updateByUuid(inventoryUpdate);
+				ResponseResultVO<Boolean> booleanResponseResultVO = inventoryService.updateByUuid(inventoryUpdate);
 			}
 		}
 		return ResponseResultUtil.success();

src/main/java/com/dk/mdm/service/ivt/inventory/InventoryService.java

@@ -84,6 +84,15 @@ public class InventoryService extends BaseService<Inventory> {
     @Autowired
     private CommonMapper commonMapper;
 
+    /**
+     * @desc   : 重写主键
+     * @author : 宋扬
+     * @date   : 2024/5/9 13:10
+     */
+    @Override
+    public String getPrimaryKey() {
+        return "inv_id";
+    }
 
     /**
      * @desc : 条件查询

src/main/java/com/dk/mdm/service/ivt/outbound/OutCommon.java

@@ -10,6 +10,7 @@ import com.dk.mdm.model.pojo.mst.Customer;
 import com.dk.mdm.model.pojo.sale.MultiOwner;
 import com.dk.mdm.model.vo.ivt.OutboundVO;
 import com.dk.mdm.service.common.CommonService;
+import com.dk.mdm.service.mst.CustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -33,6 +34,9 @@ public class OutCommon {
     private CustomerMapper customerMapper;
 
     @Autowired
+    private CustomerService customerService;
+
+    @Autowired
     private MultiOwnerMapper multiOwnerMapper;
 
 
@@ -61,6 +65,16 @@ public class OutCommon {
                     .setReportStaff(outboundVO.getMakeStaff()).setSaleStatus(Constant.SaleStatus.CHENGJIAO.getName()).setCpId(outboundVO.getCpId());
             customerMapper.insert(customer);
             outboundVO.setCusId(customer.getCusId());
+        }else {
+            //编辑客户
+            Customer customer = new Customer();
+            customer.setCusName(outboundVO.getCusName()).setCusId(outboundVO.getCusId())
+                    .setCusPhone(outboundVO.getCusPhone()).setAddressArea(outboundVO.getAddressArea()).setAddressName(outboundVO.getAddressName())
+                    .setAddressNo(outboundVO.getAddressNo()).setAddressGcj02(outboundVO.getAddressGcj02()).setAddressFull(outboundVO.getAddressFull())
+                    .setContactName(outboundVO.getContactName()).setContactPhone(outboundVO.getContactPhone()).setCusFrom(outboundVO.getCusFrom())
+                    .setChannelId(outboundVO.getSalesChannel()).setOrgId(outboundVO.getOrgId()).setStaffId(outboundVO.getStaffId())
+                    .setSaleStatus(Constant.SaleStatus.CHENGJIAO.getName());
+            customerService.updateByUuid(customer);
         }
 
         return outboundVO;

src/main/java/com/dk/mdm/service/ivt/outbound/OutboundSaleOrderService.java

@@ -106,9 +106,10 @@ public class OutboundSaleOrderService extends BaseService<Outbound> {
     @Transactional(rollbackFor = {Exception.class})
     public ResponseResultVO<?> saleOrderOutboundInsert(OutboundVO outboundVO) {
         //region 如果没有客户id，要新建
-        if (outboundVO.getCusId() == null) {
-            outboundVO = outCommon.insertCustomer(outboundVO);
-        }
+//        if (outboundVO.getCusId() == null) {
+//
+//        }
+        outboundVO = outCommon.insertCustomer(outboundVO);
         //endregion
 
         //region  查询当前公司的系统参数  自动办理信息  并赋值

src/main/java/com/dk/mdm/service/mac/AccountService.java

@@ -696,7 +696,7 @@ public class AccountService extends BaseService<Account> {
             inboundMapper.update(null, updateWrapper);
         }
         // 其他支出单
-        else if ("t_mac_other_payable".equals(biznisType)) {
+        else if ("".equals(biznisType)) {
             OtherPayable otherPayable = otherPayableMapper.selectByIdForUpdate(invoiceId);
             objectId = otherPayable.getObjectId();
 
@@ -710,7 +710,7 @@ public class AccountService extends BaseService<Account> {
             }
 
             // 插入账款明细
-            accountItemInsert.setAccItemType(Constant.accItemType.YING_SHOU.getName())
+            accountItemInsert.setAccItemType(Constant.accItemType.YING_FU.getName())
                     .setObjectId(objectId).setOrgId(otherPayable.getOrgId()).setStaffId(otherPayable.getStaffId())
                     .setAccDate(otherPayable.getAccDate()).setRecStatus(Constant.recStatuse.QUE_DING.getName())
                     .setAmtShould(otherPayable.getSumAmtPayable()).setAmtResidue(otherPayable.getSumAmtPayable())
@@ -765,7 +765,7 @@ public class AccountService extends BaseService<Account> {
             inboundMapper.update(null, updateWrapper);
         }
         // 其他支出单
-        else if ("t_mac_other_payable".equals(biznisType)) {
+        else if ("".equals(biznisType)) {
             OtherPayable otherPayable = otherPayableMapper.selectByIdForUpdate(invoiceId);
             objectId = otherPayable.getObjectId();
 

src/main/java/com/dk/mdm/service/mst/GoodsBrandService.java

@@ -101,7 +101,7 @@ public class GoodsBrandService extends BaseService<GoodsBrand> {
                 goodsBrandMapper.saveSupplierBrand(supplierId, goodsBrand.getBrandId());
             }
         }
-        return ResponseResultUtil.success();
+        return ResponseResultUtil.success(goodsBrand);
     }
 
 

src/main/java/com/dk/mdm/service/mst/GoodsSkuService.java

@@ -101,14 +101,13 @@ public class GoodsSkuService extends BaseService<GoodsSku> {
 		goodsSku.setSkuCode(codeMap.get("outNote").toString());
 		super.insert(goodsSku);
 
-		if(goodsSkuVO.getWhId()!=null){
+		if(goodsSkuVO.getWhId()!=null){ //生成入库单数据  插入存货表
 			  String StaffId = authUtils.getStaff().getStaffId();
-
 			//总单
 			InboundVO inboundVO = new InboundVO();
 			inboundVO.setIntoType(Constant.IntoType.BEGIN.getName());
 			inboundVO.setIntoingQty(goodsSkuVO.getIntoQty());
-			inboundVO.setIntoingAmt(goodsSkuVO.getIntoAmt());
+			inboundVO.setIntoingAmt(goodsSkuVO.getIntoQty().multiply(goodsSkuVO.getPriceInto()));
 			inboundVO.setStaffId(StaffId);
 			inboundVO.setMakeStaff(StaffId);
 			inboundVO.setOrgId(goodsSkuVO.getOrgId());
@@ -121,8 +120,8 @@ public class GoodsSkuService extends BaseService<GoodsSku> {
 			List<InboundItemVO> inboundItemVOList = new ArrayList<>();
 			InboundItemVO inboundItemVO = new InboundItemVO();
 			inboundItemVO.setIntoingQty(goodsSkuVO.getIntoQty());
-			inboundItemVO.setIntoingAmt(goodsSkuVO.getIntoAmt());
-			inboundItemVO.setPriceInto(goodsSkuVO.getIntoAmt());
+			inboundItemVO.setIntoingAmt(goodsSkuVO.getIntoQty().multiply(goodsSkuVO.getPriceInto()));
+			inboundItemVO.setPriceInto(goodsSkuVO.getPriceInto());
 			inboundItemVO.setIntoQty(goodsSkuVO.getIntoQty());
 			inboundItemVO.setItemIndex(0);
 			inboundItemVO.setSkuId(goodsSku.getSkuId());

src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -548,6 +548,14 @@ public class StaffService extends BaseService<Staff> {
         // 先根据userId查询当前企业的员工信息
         StaffResponse staff = staffMapper.selectByUserId(param.get("userId").toString(), Integer.parseInt(param.get("cpId").toString()));
         if (staff != null) {
+            // 提示不允许登录
+            if(staff.getFlgCanLogin() == null || !staff.getFlgCanLogin()){
+                return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.STAFF_CAN_NOT_LOGIN.getMessage());
+            }
+            // 离职状态不允许登录
+            if(staff.getHrStatus() != 1){
+                return ResponseResultUtil.error(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.STAFF_OUT_NOT_LOGIN.getMessage());
+            }
             // 存Redis
             authUtils.saveStaff(new StaffEntity().setStaffId(staff.getStaffId())
                     .setWxUserId(staff.getWxUserId())