Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java

@@ -570,7 +570,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                         //分配目标组织:TOrgId  (必填项)
                         stkInStock.setTOrgId(stkInStock.getFPurchaseOrgId());
                         //供应商:FSupplierId  (必填项)
-                        stkInStock.setFSupplierId(otherCodeDC);
+                        stkInStock.setFSupplierId(basePurchaseSystemDetailsVoDR.getSuppCustCode());
                         // 物料列表:FInStockEntry  (必填项)
                         List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
                         List<ScmApplyInboundVehQueryDto> scmApplyInboundVehQuerys = new ArrayList<>();
@@ -709,8 +709,6 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             String orgCodeDR = basePurchaseSystemDetailsVoDR.getOrgCode();
             //调入根据code获取组织信息
             SysOrganization sysOrganization = sysOrganizationFeign.selectByOrgCode(orgCodeDR).getData();
-            //调入获取组织的otherCode
-            String otherCode = sysOrganization.getOtherCode();
             //销售部门:FSaleDeptID  (必填项)
             salOutStock.setFSaleDeptID(purchaseSystemCode);
             //销售组织:FSaleOrgId  (必填项)
@@ -718,7 +716,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
             //判断采购系统对应的财务分公司code
             salOutStock.setFSaleOrgId(orgCode);
             //客户:FCustomerID  (必填项)
-            salOutStock.setFCustomerID(otherCode);
+            salOutStock.setFCustomerID(basePurchaseSystemDetailsVo.getSuppCustCode());
             List<SalOutStock.FEntity> fEntity = new ArrayList<>();
             for (BaseVehicle baseVehicle : baseVehicles) {
                 //销售出库单物料信息

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/TerminalApplication.java

@@ -15,7 +15,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.anrui.terminal",
         "com.yxt.common.base.config"
 },exclude = {DataSourceAutoConfiguration.class})
-@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.crmMaintenanceenterpriseRecord","com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply","com.yxt.anrui.terminal.fegin.asbusclaimcheckapply","com.yxt.anrui.terminal.fegin.asoldparts","com.yxt.anrui.terminal.fegin.wmsoldregister","com.yxt.anrui.terminal.fegin.asbusrepairinventorybill","com.yxt.anrui.terminal.fegin.wmsoldinventory","com.yxt.anrui.terminal.fegin.wmswarehouserack","com.yxt.anrui.terminal.fegin.asbusrepairinventorybilldetail","com.yxt.anrui.terminal.fegin.wmsinventoryrecord","com.yxt.anrui.terminal.fegin.asstandrecordapply","com.yxt.anrui.terminal.fegin.wmsotheroutapply","com.yxt.anrui.terminal.fegin.oaleaveapply","com.yxt.anrui.terminal.fegin.oamendapply","com.yxt.anrui.terminal.fegin.wmsgoodstag","com.yxt.anrui.terminal.fegin.wmsinitialdetail"})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.portal", "com.yxt.anrui.crm", "com.yxt.anrui.base", "com.yxt.anrui.riskcenter","com.yxt.anrui.flowable","com.yxt.anrui.buscenter","com.yxt.anrui.scm","com.yxt.anrui.fin", "com.yxt.anrui.terminal.fegin.wmsinventorycheckbill","com.yxt.anrui.terminal.fegin.wmsinventoryprofitin","com.yxt.anrui.terminal.fegin.wmsinventoryprofitout","com.yxt.anrui.terminal.fegin.basegoodssku","com.yxt.anrui.terminal.fegin.basesupplierinfo","com.yxt.anrui.terminal.fegin.wmsInventory","com.yxt.anrui.terminal.fegin.asbusrepairbill","com.yxt.anrui.terminal.fegin.pmspurchasebill","com.yxt.anrui.terminal.fegin.pmspurchasebackbill","com.yxt.anrui.terminal.fegin.smspricestrategybill","com.yxt.anrui.terminal.fegin.astechtitleapply","com.yxt.anrui.terminal.fegin.asserviceaccommapply","com.yxt.anrui.terminal.fegin.asbusclaiminvoicebill","com.yxt.anrui.terminal.fegin.wmsinventoryallocatebill","com.yxt.anrui.terminal.fegin.asoldpartreturnapply","com.yxt.anrui.terminal.fegin.asoldparthandleapply","com.yxt.anrui.terminal.fegin.asbwdiffapply","com.yxt.anrui.terminal.fegin.asbwinvoiceapply","com.yxt.anrui.terminal.fegin.ashosesuppapply","com.yxt.anrui.terminal.fegin.asbusclaimcheckapply","com.yxt.anrui.terminal.fegin.asoldparts","com.yxt.anrui.terminal.fegin.wmsoldregister","com.yxt.anrui.terminal.fegin.asbusrepairinventorybill","com.yxt.anrui.terminal.fegin.wmsoldinventory","com.yxt.anrui.terminal.fegin.wmswarehouserack","com.yxt.anrui.terminal.fegin.asbusrepairinventorybilldetail","com.yxt.anrui.terminal.fegin.wmsinventoryrecord","com.yxt.anrui.terminal.fegin.asstandrecordapply","com.yxt.anrui.terminal.fegin.wmsotheroutapply","com.yxt.anrui.terminal.fegin.oaleaveapply","com.yxt.anrui.terminal.fegin.oamendapply","com.yxt.anrui.terminal.fegin.wmsgoodstag","com.yxt.anrui.terminal.fegin.wmsinitialdetail","com.yxt.anrui.terminal.fegin.smsgoods","com.yxt.anrui.terminal.fegin.crmMaintenanceenterpriseRecord"})
 public class TerminalApplication {
 
     public static void main(String[] args) {

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/firstshelves/AppFirstShelvesService.java

@@ -235,17 +235,17 @@ public class AppFirstShelvesService {
             smsGoodsDto.setSupplierName(wmsInitialDetail.getSupplierName());
             smsGoodsDto.setUnit(wmsGoodsTag.getUnit());
             smsGoodsDto.setCost(wmsInitialDetail.getInCost().toString());
-            BigDecimal saleGuidePrice = wmsInitialDetail.getSaleGuidePrice();
+            BigDecimal inCost = wmsInitialDetail.getInCost();
             SmsPricestrategyBillDetailDetailsVo data = smsPricestrategyBillFeign.selByGoodsTypeSid(wmsInitialDetail.getGoodsTypeSid()).getData();
             if (data == null) {
-                smsGoodsDto.setPrice(saleGuidePrice.toString());
+                smsGoodsDto.setPrice(inCost.toString());
             } else {
                 List<SmsPricestrategyBillGoodstypedetailDetailsVo> smsPricestrategyBillGoodstypedetailDetailsVos = data.getSmsPricestrategyBillGoodstypedetailList();
                 for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : smsPricestrategyBillGoodstypedetailDetailsVos) {
-                    if (saleGuidePrice.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && saleGuidePrice.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
+                    if (inCost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && inCost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
                         BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate();
-                        saleGuidePrice = saleGuidePrice.add(saleGuidePrice.multiply(markupRate).divide(new BigDecimal("100")));
-                        smsGoodsDto.setPrice(saleGuidePrice.toString());
+                        inCost = inCost.add(inCost.multiply(markupRate).divide(new BigDecimal("100")));
+                        smsGoodsDto.setPrice(inCost.toString());
                     }
                 }
             }

yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsSpuRest.java

@@ -99,6 +99,12 @@ public class BaseGoodsSpuRest {
         return baseGoodsSpuService.selIsGoodsID(sid);
     }
 
+    @ApiOperation("根据商品类型sid查询商品类型名称")
+    @GetMapping("/selGoodsTypeBySid")
+    public ResultBean<String> selGoodsTypeBySid(@RequestParam("sid") String sid){
+        return baseGoodsSpuService.selGoodsTypeBySid(sid);
+    }
+
     @ApiOperation("根据图号和部门查询商品信息是否存在")
     @GetMapping("/selByCodeAndDept")
     ResultBean<Integer> selByCodeAndDept(@RequestParam("code") String code,@RequestParam("deptSid") String deptSid){

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.java

@@ -30,4 +30,6 @@ public interface BaseGoodsSpuMapper extends BaseMapper<BaseGoodsSpu> {
     int selByCodeAndDept(@Param("code") String code,@Param("deptSid") String deptSid);
 
     List<BaseGoodsSpu> selPurchaseAssetInfo(@Param("useOrgSid") String useOrgSid,@Param("name") String name);
+
+    String selGoodsTypeBySid(@Param("sid") String sid);
 }

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuMapper.xml

@@ -109,4 +109,7 @@ WHERE
             and goodsCode like concat('%',#{name},'%')
         </if>
     </select>
+    <select id="selGoodsTypeBySid" resultType="java.lang.String">
+        select goodsTypeName from base_goods_type where sid = #{sid}
+    </select>
 </mapper>

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java

@@ -633,4 +633,10 @@ public class BaseGoodsSpuService extends MybatisBaseService<BaseGoodsSpuMapper,
         }
         return rb.success().setData(list);
     }
+
+    public ResultBean<String> selGoodsTypeBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        String typeName = baseMapper.selGoodsTypeBySid(sid);
+        return rb.success().setData(typeName);
+    }
 }

yxt-crm-biz/src/main/java/com/yxt/crm/biz/crmmaintenanceenterpriserecord/CrmMaintenanceenterpriseRecordService.java

@@ -327,6 +327,7 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
             BeanUtil.copyProperties(entity, vo);
             if (StringUtils.isNotBlank(entity.getProcInstId())) {
                 vo.setInstanceId(entity.getProcInstId());
+                vo.setProcInsId(entity.getProcInstId());
             }
             vo.setCreateTime(DateUtil.formatDate(entity.getCreateTime()));
             if (null != entity.getFilingIndate()) {
@@ -764,6 +765,9 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
                             if (StringUtils.isNotBlank(veh.getVinNo())) {
                                 v.setVinNo(veh.getVinNo());
                             }
+                            if (null != veh.getBuyDate()) {
+                                v.setBuyDate(DateUtil.formatDate(veh.getBuyDate()));
+                            }
                             v.setCustomerSid(customerSid);
                             asCustomerVehicleFeign.save(v);
                         } else {
@@ -774,6 +778,9 @@ public class CrmMaintenanceenterpriseRecordService extends MybatisBaseService<Cr
                             if (StringUtils.isNotBlank(veh.getVinNo())) {
                                 v.setVinNo(veh.getVinNo());
                             }
+                            if (null != veh.getBuyDate()) {
+                                v.setBuyDate(DateUtil.formatDate(veh.getBuyDate()));
+                            }
                             v.setCustomerSid(customerSid);
                             asCustomerVehicleFeign.save(v);
                         }

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java

@@ -435,12 +435,12 @@ public class SmsPricestrategyBillService extends MybatisBaseService<SmsPricestra
                     List<SmsPricestrategyBillGoodstypedetailDetailsVo> smsPricestrategyBillGoodstypedetailDetailsVos = smsPricestrategyBillGoodstypedetailService.selByMainSid(smsPricestrategyBillDetailDetailsVo.getSid());
                     List<SmsGoods> smsGoods = smsGoodsService.selByGoodsTypeSid(smsPricestrategyBillDetailDetailsVo.getGoodsTypeSid());
                     for (SmsGoods smsGood : smsGoods) {
-                        BigDecimal price = smsGood.getPrice();
+                        BigDecimal cost = smsGood.getCost();
                         for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : smsPricestrategyBillGoodstypedetailDetailsVos) {
-                            if (price.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && price.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
+                            if (cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
                                 BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate();
-                                price = price.add(price.multiply(markupRate).divide(new BigDecimal("100")));
-                                smsGoodsService.updateSalesPrice(smsGood.getSid(), price.toString());
+                                cost = cost.add(cost.multiply(markupRate).divide(new BigDecimal("100")));
+                                smsGoodsService.updateSalesPrice(smsGood.getSid(), cost.toString());
                             }
                         }
                     }

yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybilldetail/SmsPricestrategyBillDetailMapper.xml

@@ -14,5 +14,7 @@
         WHERE sd.goodsTypeSid = #{goodsTypeSid}
           AND sb.deptSid = #{deptSid}
           AND sb.nodeState = '已办结'
+        ORDER BY sb.createTime DESC
+            LIMIT 1
     </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsshelfbill/WmsShelfBillService.java

@@ -853,13 +853,15 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                 //推送商品销售列表
                 //计算sku销售价
                 BigDecimal cost = BigDecimal.ZERO;//入库价
+                if (null != receiptBillDetail.getCost()) {
+                    cost = receiptBillDetail.getCost();
+                }
                 BigDecimal price = BigDecimal.ZERO;//计算后的销售价
                 BaseGoodsSpu baseGoodsSpu = baseGoodsSpuFeign.fetchEntityBySid(shelfBillGoods.getGoodsSpuSid()).getData();
                 String tjmxSid = smsPricesTrategyBillDetailFeign.selSid(baseGoodsSpu.getGoodsTypeSid(), deptSid).getData();
                 if (StringUtils.isNotBlank(tjmxSid)) {
                     List<SmsPricestrategyBillGoodstypedetailDetailsVo> data = smsPricesTrategyBillGoodsTypeDetailFeign.selByMainSid(tjmxSid).getData();
                     for (SmsPricestrategyBillGoodstypedetailDetailsVo smsPricestrategyBillGoodstypedetailDetailsVo : data) {
-                        cost = receiptBillDetail.getCost();
                         if (cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeStart()) != -1 && cost.compareTo(smsPricestrategyBillGoodstypedetailDetailsVo.getRangeEnd()) != 1) {
                             BigDecimal markupRate = smsPricestrategyBillGoodstypedetailDetailsVo.getMarkupRate();
                             price = cost.add(cost.multiply(markupRate).divide(new BigDecimal("100")));
@@ -873,8 +875,13 @@ public class WmsShelfBillService extends MybatisBaseService<WmsShelfBillMapper,
                 smsGoodsDto.setCreateOrgSid(createOrgSid);
                 smsGoodsDto.setGoodsID(goodsID);
                 smsGoodsDto.setGoodsTypeSid(baseGoodsSpu.getGoodsTypeSid());
+                String typeName = baseGoodsSpuFeign.selGoodsTypeBySid(baseGoodsSpu.getGoodsTypeSid()).getData();
+                if (StringUtils.isNotBlank(typeName)) {
+                    smsGoodsDto.setGoodsTypeName(typeName);
+                }
                 smsGoodsDto.setSupplierSid(supplierSid);
                 smsGoodsDto.setSupplierName(supplierName);
+                smsGoodsDto.setGoodsSkuTitle(baseGoodsSpu.getGoodsName());
                 smsGoodsDto.setCost(cost.toString());
                 if (price.compareTo(BigDecimal.ZERO) != 0) {
                     smsGoodsDto.setPrice(price.toString());

yxt-wms-biz/src/main/java/com/yxt/wms/feign/base/basegoodspu/BaseGoodsSpuFeign.java

@@ -1,13 +1,10 @@
 package com.yxt.wms.feign.base.basegoodspu;
 
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuDetailsVo;
-import com.yxt.wms.feign.base.basegoodssku.BaseGoodsSkuFeignFallback;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 /**
@@ -33,4 +30,9 @@ public interface BaseGoodsSpuFeign {
       @ApiOperation("根据图号和部门查询商品信息是否存在")
       @GetMapping("/selByCodeAndDept")
       ResultBean<Integer> selByCodeAndDept(@RequestParam("code") String code,@RequestParam("deptSid") String deptSid);
+
+      @ApiOperation("根据商品类型sid查询商品类型名称")
+      @GetMapping("/selGoodsTypeBySid")
+      public ResultBean<String> selGoodsTypeBySid(@RequestParam("sid") String sid);
+
 }