合同导入更新、替换磅单识别车辆筛选、判断修改合同是否开付款申请

SC-boot/linkage-scm/src/main/java/jnpf/contractfile/service/impl/ContractFileServiceImpl.java

@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import jnpf.util.*;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -358,8 +359,28 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
                         .eq("department_id", detpartment)
                         ;
                 List<ContractFileEntity> list = contractFileMapper.selectList(queryWrapper);
+                String amo="0";
                 if (list.size() > 0) {
                     System.out.println(list);
+                    ContractFileEntity contractFileEntity =new ContractFileEntity();
+
+                    contractFileEntity.setId(list.get(0).getId());
+                    contractFileEntity.setContractNo(model.getContractNo());
+                    BigDecimal amo1 =new BigDecimal(amo);
+                    BigDecimal Num1 =new BigDecimal(model.getNum());
+                    BigDecimal Amount1 =new BigDecimal(model.getAmount());
+                    if (model.getNum()==null){
+                        contractFileEntity.setNum(amo1);
+                    }else {
+                        contractFileEntity.setNum(Num1);
+                    }
+                    if (model.getAmount()==null){
+                        contractFileEntity.setAmount(amo1);
+                    }else {
+                        contractFileEntity.setAmount(Amount1);
+                    }
+                    contractFileEntity.setLastModifyTime(new Date());
+                    updateById(contractFileEntity);
                 } else {
                     dataRowMap.put("contractCode", model.getContractCode());
                     dataRowMap.put("contractName", model.getContractName());
@@ -369,14 +390,11 @@ public class ContractFileServiceImpl extends ServiceImpl<ContractFileMapper, Con
                     dataRowMap.put("declarationDate", model.getDeclarationDate());
                     dataRowMap.put("name", model.getName());
                     if (model.getNum()==null){
-                        String amo="0";
                         dataRowMap.put("num", amo);
                     }else {
                         dataRowMap.put("num", model.getNum());
                     }
-
                     if (model.getAmount()==null){
-                        String amo="0";
                         dataRowMap.put("amount", amo);
                     }else {
                         dataRowMap.put("amount", model.getAmount());

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/controller/TradeuploadController.java

@@ -34,6 +34,8 @@ import jnpf.materialvo.service.MaterialService;
 import jnpf.model.UploaderVO;
 import jnpf.ocr_sdk.baiduUtils.VatInvoice;
 import jnpf.ocr_sdk.controller.BaiduOcrController;
+import jnpf.purchaseback.entity.PurchaseorderEntity;
+import jnpf.purchaseback.service.PurchaseorderService;
 import jnpf.supplier.entity.SupplierEntity;
 import jnpf.supplier.service.SupplierService;
 import jnpf.tradeupload.entity.TradeuploadEntity;
@@ -111,6 +113,8 @@ public class TradeuploadController {
     private Jg_naturalService naturalService;
     @Autowired
     private YozoUtils yozoUtils;
+    @Autowired
+    private PurchaseorderService purchaseorderService;
 
 
     /**
@@ -796,6 +800,12 @@ public class TradeuploadController {
                 vo.setSupplierName(supplierEntity.getSupplierName());
             }
         }
+        if(StringUtils.isNotBlank(vo.getPurchaseorderId())){
+            PurchaseorderEntity purchaseorderEntity = purchaseorderService.getById(vo.getPurchaseorderId());
+            if(purchaseorderEntity != null){
+                vo.setIsPayment(purchaseorderEntity.getIsPayment());
+            }
+        }
 //        vo.setOriginPlace(generaterSwapUtil.provinceData(vo.getOriginPlace()));
         //子表
         //副表

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/entity/TradeuploadEntity.java

@@ -188,6 +188,12 @@ public class TradeuploadEntity  {
     @TableField("COLLECT_PRICE")
     private BigDecimal collectPrice;
 
+    @TableField("PURCHASEORDER_ID")
+    private String purchaseorderId;
+
+    @TableField("SALESORDER_ID")
+    private String salesorderId;
+
     @TableField(exist = false)
     private String materialName;
 
@@ -208,4 +214,7 @@ public class TradeuploadEntity  {
 
     @TableField(exist = false)
     private String purchaseName;
+
+    @TableField(exist = false)
+    private String isPayment;
 }

SC-boot/linkage-scm/src/main/java/jnpf/tradeupload/model/tradeupload/TradeuploadInfoVO.java

@@ -159,4 +159,13 @@ public class TradeuploadInfoVO{
 
         @JsonProperty("purchaseStatus")
         private String purchaseStatus;
+
+        @JsonProperty("purchaseorderId")
+        private String purchaseorderId;
+
+        @JsonProperty("salesorderId")
+        private String salesorderId;
+
+        @JsonProperty("isPayment")
+        private String isPayment;
 }

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/controller/VehicleController.java

@@ -98,6 +98,31 @@ public class VehicleController {
         return ActionResult.success(vo);
     }
 
+    /**
+     * 查询
+     *
+     * @param vehiclePagination
+     * @return
+     */
+    @PostMapping("/getList1")
+    @ApiOperation("查询")
+    public ActionResult list1(@RequestBody VehiclePagination vehiclePagination)throws IOException{
+        List<VehicleEntity> list= vehicleService.getList1(vehiclePagination);
+        //处理id字段转名称，若无需转或者为空可删除
+        for(VehicleEntity entity:list){
+//            entity.setVehiclephotos(generaterSwapUtil.getFileNameInJson(entity.getVehiclephotos()));
+        }
+        List<VehicleListVO> listVO=JsonUtil.getJsonToList(list,VehicleListVO.class);
+//        for(VehicleListVO vehicleVO:listVO){
+//        }
+
+
+        PageListVO vo=new PageListVO();
+        vo.setList(listVO);
+        PaginationVO page=JsonUtil.getJsonToBean(vehiclePagination,PaginationVO.class);
+        vo.setPagination(page);
+        return ActionResult.success(vo);
+    }
 
     /**
      * 创建
@@ -312,7 +337,7 @@ public class VehicleController {
         VehicleEntity entity= vehicleService.getInfo(id);
         if(entity!=null){
             VehicleEntity subentity=JsonUtil.getJsonToBean(vehicleUpForm, VehicleEntity.class);
-					subentity.setCreatortime(entity.getCreatortime());
+					subentity.setCreatorTime(entity.getCreatorTime());
             vehicleService.update(id, subentity);
         return ActionResult.success("更新成功");
         }else{

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/entity/VehicleEntity.java

@@ -28,7 +28,7 @@ public class VehicleEntity  {
     private String creatorusername;
 
     @TableField(value = "CREATOR_TIME",fill = FieldFill.INSERT)
-    private Date creatortime;
+    private Date creatorTime;
 
     @TableField(value = "LAST_MODIFY_USER_ID",fill = FieldFill.UPDATE)
     private String lastModifyUserId;

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/mapper/VehicleMapper.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import jnpf.vehicle.entity.VehicleEntity;
 import jnpf.vehicle.entity.VehicleMobileEntity;
+import jnpf.vehicle.model.vehicle.VehiclePagination;
 import org.apache.ibatis.annotations.Param;
 
 
@@ -21,4 +22,7 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface VehicleMapper extends BaseMapper<VehicleEntity> {
     IPage<VehicleMobileEntity> getVehicleList(@Param("page") Page<VehicleMobileEntity> page, @Param("ew") Wrapper<VehicleEntity> queryWrapper);
+
+    //车辆筛选换接口
+    IPage<VehicleEntity> getVehicleList1(@Param("page") Page<VehicleEntity> page,@Param("vehiclePagination") VehiclePagination vehiclePagination, @Param("ew") Wrapper<VehicleEntity> queryWrapper);
 }

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/VehicleService.java

@@ -22,9 +22,10 @@ public interface VehicleService extends IService<VehicleEntity> {
 
     List<VehicleMobileEntity> getList(VehiclePagination vehiclePagination);
 
-    List<VehicleEntity> getTypeList(VehiclePagination vehiclePagination,String dataType);
 
+    List<VehicleEntity> getTypeList(VehiclePagination vehiclePagination,String dataType);
 
+    List<VehicleEntity> getList1(VehiclePagination vehiclePagination);
 
     VehicleEntity getInfo(String id);
 

SC-boot/linkage-scm/src/main/java/jnpf/vehicle/service/impl/VehicleServiceImpl.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import jnpf.permission.model.authorize.AuthorizeConditionModel;
 import jnpf.permission.service.AuthorizeService;
+import jnpf.purchaseorder.entity.PurchaseorderitemEntity;
 import jnpf.util.ServletUtil;
 import jnpf.util.StringUtil;
 import jnpf.util.UserProvider;
@@ -134,6 +135,9 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
             return vehiclePagination.setData(list, list.size());
         }
     }
+
+
+
     @Override
     public List<VehicleEntity> getTypeList(VehiclePagination vehiclePagination,String dataType){
         String userId=userProvider.get().getUserId();
@@ -210,6 +214,101 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, VehicleEntity
         }
     }
 
+    @Override
+    public List<VehicleEntity> getList1(VehiclePagination vehiclePagination){
+        String userId=userProvider.get().getUserId();
+        List<String> AllIdList =new ArrayList();
+        int total=0;
+        int vehicleNum =0;
+        QueryWrapper<VehicleEntity> vehicleQueryWrapper=new QueryWrapper<>();
+        vehicleQueryWrapper.eq("a.delete_mark", "0");
+        boolean pcPermission = true;
+        boolean appPermission = true;
+        boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
+        if(isPc && pcPermission){
+            if (!userProvider.get().getIsAdministrator()){
+                Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
+                if (ObjectUtil.isEmpty(vehicleObj)){
+                    return new ArrayList<>();
+                } else {
+                    vehicleQueryWrapper = (QueryWrapper<VehicleEntity>)vehicleObj;
+                    vehicleNum++;
+                }
+            }
+        }
+        if(!isPc && appPermission){
+            if (!userProvider.get().getIsAdministrator()){
+                Object vehicleObj=authorizeService.getCondition(new AuthorizeConditionModel(vehicleQueryWrapper,vehiclePagination.getMenuId(),"jg_vehicle"));
+                if (ObjectUtil.isEmpty(vehicleObj)){
+                    return new ArrayList<>();
+                } else {
+                    vehicleQueryWrapper = (QueryWrapper<VehicleEntity>)vehicleObj;
+                    vehicleNum++;
+                }
+
+
+            }
+        }
+//        if(StringUtil.isNotEmpty(vehiclePagination.getTicketno())){
+//            vehicleNum++;
+//            vehicleQueryWrapper.lambda().like(VehicleEntity::getTicketno,vehiclePagination.getTicketno());
+//        }
+//
+//        if(StringUtil.isNotEmpty(vehiclePagination.getDrivername())){
+//            vehicleNum++;
+//            vehicleQueryWrapper.lambda().like(VehicleEntity::getDrivername,vehiclePagination.getDrivername());
+//        }
+//        if(StringUtil.isNotEmpty(vehiclePagination.getContact())){
+//            vehicleNum++;
+//            vehicleQueryWrapper.lambda().like(VehicleEntity::getContact,vehiclePagination.getContact());
+//        }
+
+//        if(StringUtil.isNotEmpty(vehiclePagination.getKeyword())){
+//            vehicleNum++;
+//            vehicleQueryWrapper.lambda().and(wq -> {
+//                // 拼接sql
+//                wq.like(VehicleEntity::getDrivername,vehiclePagination.getKeyword())
+//                        .or()
+//                        .like(VehicleEntity::getTicketno,vehiclePagination.getKeyword());
+//            });
+//        }
+
+        if(AllIdList.size()>0){
+            vehicleQueryWrapper.lambda().in(VehicleEntity::getId, AllIdList);
+        }
+        //排序
+        if(StringUtil.isEmpty(vehiclePagination.getSidx())){
+//            vehicleQueryWrapper.lambda().orderByDesc(VehicleEntity::getId);
+            vehiclePagination.setSidx("CREATOR_TIME");
+            vehiclePagination.setSort("DESC");
+        }else{
+            try {
+                String sidx = vehiclePagination.getSidx();
+                VehicleEntity vehicleEntity = new VehicleEntity();
+                Field declaredField = vehicleEntity.getClass().getDeclaredField(sidx);
+                declaredField.setAccessible(true);
+                String value = declaredField.getAnnotation(TableField.class).value();
+                vehiclePagination.setSidx(value);
+          //      vehicleQueryWrapper="asc".equals(vehiclePagination.getSort().toLowerCase())?vehicleQueryWrapper.orderByAsc(value):vehicleQueryWrapper.orderByDesc(value);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        Page<VehicleEntity> page=new Page<>(vehiclePagination.getCurrentPage(), vehiclePagination.getPageSize());
+//            IPage<VehicleMobileEntity> userIPage=this.page(page, vehicleQueryWrapper);
+        IPage<VehicleEntity> userIPage = vehicleMapper.getVehicleList1(page, vehiclePagination, vehicleQueryWrapper);
+        return vehiclePagination.setData(userIPage.getRecords(),userIPage.getTotal());
+//        if((total>0 && AllIdList.size()>0) || total==0){
+//            Page<VehicleEntity> page=new Page<>(vehiclePagination.getCurrentPage(), vehiclePagination.getPageSize());
+//            IPage<VehicleMobileEntity> userIPage=this.page(page, vehicleQueryWrapper);
+//            IPage<VehicleEntity> userIPage = vehicleMapper.getVehicleList1(page, vehiclePagination, vehicleQueryWrapper);
+//            return vehiclePagination.setData(userIPage.getRecords(),userIPage.getTotal());
+//        }else{
+//            List<VehicleEntity> list = new ArrayList();
+//            return vehiclePagination.setData(list, list.size());
+//        }
+    }
+
     @Override
     public VehicleEntity getInfo(String id){
         QueryWrapper<VehicleEntity> queryWrapper=new QueryWrapper<>();

SC-boot/linkage-scm/src/main/resources/mapper/poundlist/PoundlistMapper.xml

@@ -57,7 +57,7 @@ WHERE a.delete_mark = 0 and
 
 	<select id="queryByKeyword" resultType="jnpf.poundlist.entity.PoundlistEntity">
 		SELECT a.*,b.ticketno vehicleName,c.supplier_name supplierName,d.supplier_nm customerName,e.item_name materialName,f.contract_name salesName,g.contract_name purchaseName,h.F_RealName businessName,
-		i.name naturalName,g.contract_no purchaseContractNo,f.contract_no salesContractNo, j.id purchaseorderItem0Id,k.id salesorderItem0Id,k.rate saleRate
+		i.name naturalName,g.contract_no purchaseContractNo,f.contract_no salesContractNo, j.id purchaseorderItem0Id,k.id salesorderItem0Id,k.rate saleRate,jp.is_payment isPayment
 		from jg_poundlist a
 		LEFT JOIN jg_vehicle b on a.vehicle_id = b.id and b.delete_mark = 0
 		LEFT JOIN jg_supplier c on a.supplier_id = c.id and c.delete_mark = 0
@@ -69,6 +69,7 @@ WHERE a.delete_mark = 0 and
 		LEFT JOIN jg_natural i on a.natural_id = i.id and i.delete_mark = 0
 		LEFT JOIN jg_purchaseorder_item0 j on a.id = j.poundlist_id and j.delete_mark = 0
 		LEFT JOIN jg_salesorder_item0 k on a.id = k.poundlist_id and k.delete_mark = 0
+		LEFT JOIN jg_purchaseorder jp ON a.purchaseorder_id=jp.id
 		${ew.customSqlSegment} and a.delete_mark = 0
 		<if test="poundlistPagination.keyword != null and poundlistPagination.keyword != ''">
             AND (b.ticketno LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{poundlistPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{poundlistPagination.keyword},'%'))

SC-boot/linkage-scm/src/main/resources/mapper/tradeupload/TradeuploadMapper.xml

@@ -16,7 +16,7 @@ creator_time = DATE_SUB(NOW(),interval 15 day)
 </select>
 
     <select id="queryByKeyword" resultType="jnpf.tradeupload.entity.TradeuploadEntity">
-        SELECT a.*,b.ticketno vehicleName,c.supplier_name supplierName,d.supplier_nm customerName,e.item_name materialName,f.contract_name salesName,g.contract_name purchaseName,h.F_RealName businessName,i.name naturalName,g.contract_no purchaseContractNo,f.contract_no salesContractNo
+        SELECT a.*,b.ticketno vehicleName,c.supplier_name supplierName,d.supplier_nm customerName,e.item_name materialName,f.contract_name salesName,g.contract_name purchaseName,h.F_RealName businessName,i.name naturalName,g.contract_no purchaseContractNo,f.contract_no salesContractNo,j.is_payment isPayment
         from jg_poundlist a
         LEFT JOIN jg_vehicle b on a.vehicle_id = b.id
         LEFT JOIN jg_supplier c on a.supplier_id = c.id
@@ -26,6 +26,7 @@ creator_time = DATE_SUB(NOW(),interval 15 day)
         LEFT JOIN jg_contract g on a.purchase_id = g.id
         LEFT JOIN base_user h on a.business_id = h.f_id
         LEFT JOIN jg_natural i on a.natural_id = i.id
+        LEFT JOIN jg_purchaseorder j ON a.purchaseorder_id=j.id
         ${ew.customSqlSegment}
         <if test="tradeuploadPagination.keyword != null and tradeuploadPagination.keyword != ''">
             AND (b.ticketno LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%'))
@@ -57,7 +58,7 @@ creator_time = DATE_SUB(NOW(),interval 15 day)
     </select>
 
     <select id="queryByKeywordNotPage" resultType="jnpf.tradeupload.entity.TradeuploadEntity">
-        SELECT a.*,b.ticketno vehicleName,c.supplier_name supplierName,d.supplier_nm customerName,e.item_name materialName,f.contract_name salesName,g.contract_name purchaseName,h.F_RealName businessName,i.name naturalName,g.contract_no purchaseContractNo,f.contract_no salesContractNo
+        SELECT a.*,b.ticketno vehicleName,c.supplier_name supplierName,d.supplier_nm customerName,e.item_name materialName,f.contract_name salesName,g.contract_name purchaseName,h.F_RealName businessName,i.name naturalName,g.contract_no purchaseContractNo,f.contract_no salesContractNo,j.is_payment isPayment
         from jg_poundlist a
         LEFT JOIN jg_vehicle b on a.vehicle_id = b.id
         LEFT JOIN jg_supplier c on a.supplier_id = c.id
@@ -67,6 +68,7 @@ creator_time = DATE_SUB(NOW(),interval 15 day)
         LEFT JOIN jg_contract g on a.purchase_id = g.id
         LEFT JOIN base_user h on a.business_id = h.f_id
         LEFT JOIN jg_natural i on a.natural_id = i.id
+        LEFT JOIN jg_purchaseorder j ON a.purchaseorder_id=j.id
         ${ew.customSqlSegment}
         <if test="tradeuploadPagination.keyword != null and tradeuploadPagination.keyword != ''">
             AND (b.ticketno LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR c.supplier_name LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%') OR d.supplier_nm LIKE CONCAT('%',#{tradeuploadPagination.keyword},'%'))

SC-boot/linkage-scm/src/main/resources/mapper/vehicle/VehicleMapper.xml

@@ -38,6 +38,8 @@
     </select>
 
 
+
+
     <resultMap id="vehicleMap" type="jnpf.vehicle.entity.VehicleMobileEntity">
         <result column="id" property="id"></result>
         <result column="creator_user_id" property="creatoruserid"></result>
@@ -59,4 +61,32 @@
         <result column="licenseCount" property="licenseCount"></result>
         <result column="licenseSum" property="licenseSum"></result>
     </resultMap>
+
+    <select id="getVehicleList1" resultType="jnpf.vehicle.entity.VehicleEntity">
+        SELECT
+        *
+        FROM
+        (
+        SELECT
+        a.*
+        FROM
+        jg_vehicle a
+--         WHERE
+--         ( a.delete_mark != 1 OR a.delete_mark IS NULL )
+
+        GROUP BY
+        a.id
+        ) a ${ew.customSqlSegment}
+        <if test="vehiclePagination.ticketno != null and vehiclePagination.ticketno != ''">
+            AND a.ticketno like concat('%',#{vehiclePagination.ticketno},'%')
+        </if>
+        <if test="vehiclePagination.drivername != null and vehiclePagination.drivername != ''">
+            AND a.drivername LIKE CONCAT('%',#{vehiclePagination.drivername},'%')
+        </if>
+        <if test="vehiclePagination.sidx != null and vehiclePagination.sidx != ''">
+            ORDER BY ${vehiclePagination.sidx} ${vehiclePagination.sort}
+        </if>
+
+    </select>
+
 </mapper>

SC-web/src/views/scm/basicInformation/poundlist/VechicleForm.vue

@@ -246,6 +246,7 @@
           purchaseId:0,
           salesIdOld:0,
           salesId:0,
+          isPayment:0,
         },
         rules: {
           materialId: [{
@@ -565,6 +566,7 @@
       dataFormSubmit() {
         var purchaseStatus = this.dataForm.purchaseStatus;//采购状态
         var salesStatus = this.dataForm.salesStatus;//销售状态
+        var isPayment = this.dataForm.isPayment;
         this.dataForm.isExamine = '1';
         this.dataForm.unit = this.dataForm.unit ? this.dataForm.unit : 0;
         this.dataForm.transportType = this.dataForm.transportType ? this.dataForm.transportType : 0;
@@ -573,7 +575,16 @@
         // var purchaseName1=this.dataForm.purchaseName;
          var purchaseIdOld=this.dataForm.purchaseIdOld;
          var salesIdOld=this.dataForm.salesIdOld;
+
         if (purchaseIdOld !=this.dataForm.purchaseId ){
+          if (isPayment==1){
+            this.$message({
+              message: '采购订单已经提交付款申请',
+              type: 'success',
+              duration: 2500
+            })
+            return
+          }
           if (purchaseStatus==0){
             this.$message({
               message: '采购订单已经生成，现在是待开票状态',

SC-web/src/views/scm/basicInformation/tradeupload/VehicleBox.vue

@@ -100,7 +100,7 @@
 				this.listQuery.menuId = '380662313734134341'
 				let listQuery = this.listQuery
 				request({
-					url: `/api/example/Vehicle/getList`,
+					url: `/api/example/Vehicle/getList1`,
 					method: 'post',
 					data: listQuery
 				}).then(res => {