|
@@ -21,6 +21,7 @@ import com.jsh.erp.exception.BusinessRunTimeException;
|
|
import com.jsh.erp.exception.JshException;
|
|
import com.jsh.erp.exception.JshException;
|
|
import com.jsh.erp.query.LambdaQueryWrapperX;
|
|
import com.jsh.erp.query.LambdaQueryWrapperX;
|
|
import com.jsh.erp.service.*;
|
|
import com.jsh.erp.service.*;
|
|
|
|
+import com.jsh.erp.utils.DateUtils;
|
|
import com.jsh.erp.utils.HttpClient;
|
|
import com.jsh.erp.utils.HttpClient;
|
|
import com.jsh.erp.utils.StringUtil;
|
|
import com.jsh.erp.utils.StringUtil;
|
|
import com.jsh.erp.utils.Tools;
|
|
import com.jsh.erp.utils.Tools;
|
|
@@ -1626,6 +1627,7 @@ public class DepotItemServiceImpl extends ServiceImpl<DepotItemMapper, DepotItem
|
|
String remark = detailMap.get("remark");
|
|
String remark = detailMap.get("remark");
|
|
item.put("operNumber", operNumber);
|
|
item.put("operNumber", operNumber);
|
|
item.put("unitPrice", unitPrice);
|
|
item.put("unitPrice", unitPrice);
|
|
|
|
+ item.put("productionDate",detailMap.get("productionDate"));
|
|
BigDecimal allPrice = BigDecimal.ZERO;
|
|
BigDecimal allPrice = BigDecimal.ZERO;
|
|
if(unitPrice!=null && unitPrice.compareTo(BigDecimal.ZERO)!=0) {
|
|
if(unitPrice!=null && unitPrice.compareTo(BigDecimal.ZERO)!=0) {
|
|
allPrice = unitPrice.multiply(operNumber);
|
|
allPrice = unitPrice.multiply(operNumber);
|
|
@@ -1640,6 +1642,10 @@ public class DepotItemServiceImpl extends ServiceImpl<DepotItemMapper, DepotItem
|
|
item.put("taxMoney", taxMoney);
|
|
item.put("taxMoney", taxMoney);
|
|
item.put("taxLastMoney", taxLastMoney);
|
|
item.put("taxLastMoney", taxLastMoney);
|
|
item.put("remark", remark);
|
|
item.put("remark", remark);
|
|
|
|
+ item.put("expiryNum",m.getExpiryNum());
|
|
|
|
+ item.put("wholesaleDecimal",m.getDefaultWholesaleDecimal());
|
|
|
|
+ item.put("defaultPurchaseDecimal",m.getDefaultPurchaseDecimal());
|
|
|
|
+ item.put("defaultWholesaleDecimal",m.getDefaultWholesaleDecimal());
|
|
arr.add(item);
|
|
arr.add(item);
|
|
} else {
|
|
} else {
|
|
throw new BusinessRunTimeException(ExceptionConstants.DEPOT_ITEM_BARCODE_IS_NOT_EXIST_CODE,
|
|
throw new BusinessRunTimeException(ExceptionConstants.DEPOT_ITEM_BARCODE_IS_NOT_EXIST_CODE,
|